diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 69e277a19..beb3cf8a0 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -401,6 +401,7 @@ if ( $version ) {
       $command .= ' --add-drop-table --databases '.$Config{ZM_DB_NAME}.' > '.$backup;
       print("Creating backup to $backup. This may take several minutes.\n");
       print("Executing '$command'\n") if logDebugging();
+      ($command) = $command =~ /(.*)/; # detaint
       my $output = qx($command);
       my $status = $? >> 8;
       if ( $status || logDebugging() ) {
@@ -995,6 +996,7 @@ sub patchDB {
   $command .= '/zm_update-'.$version.'.sql';
 
   print("Executing '$command'\n") if logDebugging();
+  ($command) = $command =~ /(.*)/; # detaint
   my $output = qx($command);
   my $status = $? >> 8;
   if ( $status || logDebugging() ) {
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 19f74333b..d1af6082d 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -848,7 +848,7 @@ function initPage() {
     if ( refreshApplet && appletRefreshTime ) {
       appletRefresh.delay(appletRefreshTime*1000);
     }
-    if ( scale == 'auto' ) changeScale();
+    if ( scale == '0' || scale == 'auto' ) changeScale();
     if ( window.history.length == 1 ) {
       $j('#closeControl').html('');
     }