diff --git a/screening/dist/admin/reset-display-settings.sh b/screening/dist/admin/reset-display-settings.sh
index 80db7a9dd44e983d5da9879734a16684874a24df..d767e7a62d705db6ab2becfefa6badea08f56288 100755
--- a/screening/dist/admin/reset-display-settings.sh
+++ b/screening/dist/admin/reset-display-settings.sh
@@ -3,7 +3,7 @@
 # Overrides all user display settings with the settings of the template user.
 
 echo Remove 'exit' after configuring existing user name, currently it is $TEMPLATE_USER
-exit
+exit 1
 TEMPLATE_USER=openbis-user-name
 
 BASE=`dirname "$0"`
diff --git a/screening/dist/admin/upgrade.sh b/screening/dist/admin/upgrade.sh
index 2f7a551dff2e6a8a714d2adb4e292c9955105b31..d2cf720e639123cd1c11acaa14ced5e1ab2a0245 100755
--- a/screening/dist/admin/upgrade.sh
+++ b/screening/dist/admin/upgrade.sh
@@ -29,7 +29,7 @@ pg_dump -U $DB_USER_NAME -Fc $OPENBIS_DB > $BACKUP_DIR/$OPENBIS_DB-${NOW}.dmp
 pg_dump -U $DB_USER_NAME -Fc $IMAGING_DB > $BACKUP_DIR/$IMAGING_DB-${NOW}.dmp
 
 echo Installing openBIS Datastore Server
-unzip $ROOT_DIR/datastore*.zip
+unzip $ROOT_DIR/datastore*.zip -d $ROOT_DIR
 
 echo Installing openBIS Application Server
 unzip $ROOT_DIR/openBIS-*.zip -d $ROOT_DIR