diff --git a/src/options.c b/src/options.c
index 07d297978..7e7fe8ffc 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1862,7 +1862,7 @@ free_menu_coloring()
 {
     struct menucoloring *tmp, *tmp2;
 
-    for (tmp = menu_colorings; tmp; tmp = tmp2) {
+    for (tmp = g.menu_colorings; tmp; tmp = tmp2) {
         tmp2 = tmp->next;
         regex_free(tmp->match);
         free((genericptr_t) tmp->origstr);
diff --git a/src/spell.c b/src/spell.c
index ef0217cd5..e22943d85 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -1302,14 +1302,14 @@ int what;
             save_tport.tport_indx = MAXSPELL;
         } else if (what == UNHIDESPELL) {
             /*assert( save_tport.savespell.sp_id == SPE_TELEPORT_AWAY );*/
-            spl_book[save_tport.tport_indx] = save_tport.savespell;
+            g.spl_book[save_tport.tport_indx] = save_tport.savespell;
             save_tport.tport_indx = MAXSPELL; /* burn bridge... */
         } else if (what == ADD_SPELL) {
-            save_tport.savespell = spl_book[i];
+            save_tport.savespell = g.spl_book[i];
             save_tport.tport_indx = i;
-            spl_book[i].sp_id = SPE_TELEPORT_AWAY;
-            spl_book[i].sp_lev = objects[SPE_TELEPORT_AWAY].oc_level;
-            spl_book[i].sp_know = KEEN;
+            g.spl_book[i].sp_id = SPE_TELEPORT_AWAY;
+            g.spl_book[i].sp_lev = objects[SPE_TELEPORT_AWAY].oc_level;
+            g.spl_book[i].sp_know = KEEN;
             return REMOVESPELL; /* operation needed to reverse */
         }
     } else { /* spellid(i) == SPE_TELEPORT_AWAY */
@@ -1317,12 +1317,12 @@ int what;
             save_tport.tport_indx = MAXSPELL;
         } else if (what == REMOVESPELL) {
             /*assert( i == save_tport.tport_indx );*/
-            spl_book[i] = save_tport.savespell;
+            g.spl_book[i] = save_tport.savespell;
             save_tport.tport_indx = MAXSPELL;
         } else if (what == HIDE_SPELL) {
-            save_tport.savespell = spl_book[i];
+            save_tport.savespell = g.spl_book[i];
             save_tport.tport_indx = i;
-            spl_book[i].sp_id = NO_SPELL;
+            g.spl_book[i].sp_id = NO_SPELL;
             return UNHIDESPELL; /* operation needed to reverse */
         }
     }
diff --git a/src/teleport.c b/src/teleport.c
index 960a50732..c3cd35093 100644
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -548,7 +548,7 @@ dotelecmd()
 
         win = create_nhwindow(NHW_MENU);
         start_menu(win);
-        any = zeroany;
+        any = g.zeroany;
         for (i = 0; i < SIZE(tports); ++i) {
             any.a_int = (int) tports[i].menulet;
             add_menu(win, NO_GLYPH, &any, (char) any.a_int, 0, ATR_NONE,