diff --git a/src/cmd.c b/src/cmd.c
index f734c9bb7..1797f49b2 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -4559,9 +4559,9 @@ randomkey()
     case 10:
     case 11:
     case 12:
-        c = Cmd.dirchars[rn2(8)];
+        c = g.Cmd.dirchars[rn2(8)];
         if (!rn2(7))
-            c = !Cmd.num_pad ? (!rn2(3) ? C(c) : (c + 'A' - 'a')) : M(c);
+            c = !g.Cmd.num_pad ? (!rn2(3) ? C(c) : (c + 'A' - 'a')) : M(c);
         break;
     case 13:
         c = (char) rn1('9' - '0' + 1, '0');
diff --git a/src/options.c b/src/options.c
index cffc58efc..c7aa7bce5 100644
--- a/src/options.c
+++ b/src/options.c
@@ -3979,7 +3979,7 @@ boolean tinitial, tfrom_file;
                     return FALSE;
                 }
             }
-            if (iflags.debug_fuzzer && !initial) {
+            if (iflags.debug_fuzzer && !g.opt_initial) {
                 /* don't randomly toggle this/these */
                 if (boolopt[i].addr == &flags.silent)
                     return TRUE;