diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index e4db1d820..56697f14b 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -610,4 +610,4 @@ bool PhysicalKeyboardHandler::handleControlEvent(StellaKey key, StellaMod mod, b
     handled = false;
 
   return handled;
-}
\ No newline at end of file
+}
diff --git a/src/common/PKeyboardHandler.hxx b/src/common/PKeyboardHandler.hxx
index cc21f05fe..5e0faaf73 100644
--- a/src/common/PKeyboardHandler.hxx
+++ b/src/common/PKeyboardHandler.hxx
@@ -75,7 +75,8 @@ class PhysicalKeyboardHandler
     // Array of key events, indexed by StellaKey
     Event::Type myKeyTable[KBDK_LAST][kNumModes];
     // Array of mod keys, indexed by StellaKey
-    StellaMod myModKeyTable[KBDK_LAST][kNumModes];
+    // TODO - uncomment when this is ready
+    //StellaMod myModKeyTable[KBDK_LAST][kNumModes];
 
     // Sometimes key combos with the Alt key become 'stuck' after the
     // window changes state, and we want to ignore that event
diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx
index a04c91f9f..fd841cfbd 100644
--- a/src/common/bspf.hxx
+++ b/src/common/bspf.hxx
@@ -111,6 +111,10 @@ namespace BSPF
     static const string ARCH = "x86_64";
   #elif defined(__powerpc__) || defined(__ppc__)
     static const string ARCH = "ppc";
+  #elif defined(__arm__) || defined(__thumb__)
+    static const string ARCH = "arm32";
+  #elif defined(__aarch64__)
+    static const string ARCH = "arm64";
   #else
     static const string ARCH = "NOARCH";
   #endif