diff --git a/gray-theme/theme.pl b/gray-theme/theme.pl
index c57f80d2e..dd4a07636 100755
--- a/gray-theme/theme.pl
+++ b/gray-theme/theme.pl
@@ -949,11 +949,28 @@ for(var i=0; i<tabnames.length; i++) {
 		       '<img src=$imgdir/lc2.gif alt=""></td>'+
 		       '<td class=\\'tabSelected\\' nowrap>'+
 		       '&nbsp;<b>'+title+'</b>&nbsp;</td>'+
-	               '<td valign=top class=\\'tabSelected\\'>'+
+		       '<td valign=top class=\\'tabSelected\\'>'+
 		       '<img src=$imgdir/rc2.gif alt=""></td>'+
 		       '</tr></table>';
     divobj.className = 'opener_shown';
+    try {
+	var nestedForm = divobj.querySelector("form[data-form-nested]");
+	if (nestedForm) {
+		var nestedFormId = nestedForm.getAttribute("data-form-nested"),
+		formSubmitters = document
+			.querySelectorAll(
+				"[data-submit-nested='" + nestedFormId + "']");
+		if (formSubmitters) {
+			formSubmitters.forEach(function(submitter) {
+				submitter.setAttribute(
+					"form", nestedForm.getAttribute('id'));
+			});
+		}
+	}
+    } catch(e) {
+	console.warn('Cannot set the related submitter ID of the nested form : ' + e);
     }
+  }
   else {
     // Non-selected tab
     tabobj.innerHTML = '<table cellpadding=0 cellspacing=0><tr>'+
diff --git a/package-updates/update.cgi b/package-updates/update.cgi
index 5dc11fab5..c46e79fac 100755
--- a/package-updates/update.cgi
+++ b/package-updates/update.cgi
@@ -17,7 +17,7 @@ else {
 	$redirdesc = $text{'index_return'};
 	}
 
-$redir = ($redir =~ /\?/) ? "$redir&tab=install" : "$redir?tab=install";
+$redir = ($redir =~ /\?/) ? "$redir&tab=pkgs" : "$redir?tab=pkgs";
 
 if ($in{'refresh'} || $in{'refresh_top'}) {
 	&ui_print_unbuffered_header(undef, $text{'refresh_title'}, "");
diff --git a/spam/spam-lib.pl b/spam/spam-lib.pl
index 68362721b..cb8577a55 100755
--- a/spam/spam-lib.pl
+++ b/spam/spam-lib.pl
@@ -607,7 +607,7 @@ sub version_atleast
 if (!$version_cache) {
 	$version_cache = &get_spamassassin_version();
 	}
-return $version_cache >= $_[0];
+return &compare_version_numbers($version_cache, '>=', $_[0]);
 }
 
 # spam_file_folder()