diff --git a/webtools/bonsai/cvsquery.cgi b/webtools/bonsai/cvsquery.cgi
index b68759c9761..feb3e524a1d 100755
--- a/webtools/bonsai/cvsquery.cgi
+++ b/webtools/bonsai/cvsquery.cgi
@@ -380,7 +380,7 @@ sub print_ci {
 #         print "   $ci->[$::CI_DIR]/$ci->[$::CI_FILE]<a>\n";
 #     }
     my $d = "$ci->[$::CI_DIR]/$ci->[$::CI_FILE]";
-    if ($::query_module eq 'allrepositories') {
+    if (defined $::query_module && $::query_module eq 'allrepositories') {
         $d = "$ci->[$::CI_REPOSITORY]/$d";
     }
     $d =~ s:/:/ :g;             # Insert a whitespace after any slash, so that
diff --git a/webtools/bugzilla/CGI.pl b/webtools/bugzilla/CGI.pl
index 76adcc702a3..30d621c7359 100644
--- a/webtools/bugzilla/CGI.pl
+++ b/webtools/bugzilla/CGI.pl
@@ -26,7 +26,7 @@ use strict;
 # Shut up misguided -w warnings about "used only once".  For some reason,
 # "use vars" chokes on me when I try it here.
 
-sub sillyness {
+sub CGI_pl_sillyness {
     my $zz;
     $zz = %::FILENAME;
 }