diff --git a/mesh_bot.py b/mesh_bot.py
index 41fac57..5ecc085 100755
--- a/mesh_bot.py
+++ b/mesh_bot.py
@@ -1077,6 +1077,7 @@ def onReceive(packet, interface):
     replyIDset = False
     emojiSeen = False
     isDM = False
+    playingGame = False
 
     if DEBUGpacket:
         # Debug print the interface object
diff --git a/modules/settings.py b/modules/settings.py
index d701934..a29747e 100644
--- a/modules/settings.py
+++ b/modules/settings.py
@@ -26,7 +26,6 @@ max_retry_count2 = 4 # max retry count for interface 2
 retry_int1 = False
 retry_int2 = False
 wiki_return_limit = 3 # limit the number of sentences returned off the first paragraph first hit
-playingGame = False
 GAMEDELAY = 28800 # 8 hours in seconds for game mode holdoff
 cmdHistory = [] # list to hold the last commands
 seenNodes = [] # list to hold the last seen nodes
diff --git a/modules/system.py b/modules/system.py
index 7b3b50e..b4f0b73 100644
--- a/modules/system.py
+++ b/modules/system.py
@@ -90,6 +90,13 @@ if location_enabled:
     else:
         # NOAA only features
         help_message = help_message + ", wxa, tide, ealert"
+
+# NOAA alerts needs location module
+if wxAlertBroadcastEnabled or emergencyAlertBrodcastEnabled:
+    from modules.locationdata import * # from the spudgunman/meshing-around repo
+    # limited subset, this should be done better but eh..
+    trap_list = trap_list + ("wx", "wxc", "wxa", "wxalert", "ea", "ealert")
+    help_message = help_message + ", wxalert, ealert"
         
 # BBS Configuration
 if bbs_enabled: