diff --git a/configure.py b/configure.py
index dc9392ee..d4a88bc8 100755
--- a/configure.py
+++ b/configure.py
@@ -27,6 +27,7 @@ COMPLETE_OBJECTS = [
     "MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint",
     "Weapons/IWeaponRenderer",
     "Kyoto/Basics/CStopwatch",
+    "Kyoto/Basics/COsContextDolphin",
     "Kyoto/Basics/CSWDataDolphin",
     "Kyoto/Audio/CSfxHandle",
     "Kyoto/Graphics/CGX",
diff --git a/include/Kyoto/Basics/COsContext.hpp b/include/Kyoto/Basics/COsContext.hpp
index 5dbf949c..007e637f 100644
--- a/include/Kyoto/Basics/COsContext.hpp
+++ b/include/Kyoto/Basics/COsContext.hpp
@@ -28,8 +28,10 @@ private:
 };
 
 class COsContext {
-  static bool mProgressiveMode;
 public:
+  // TODO: Once main.cpp is matched make this private
+  static bool mProgressiveMode;
+
   COsContext(bool, bool);
   ~COsContext();
 
@@ -38,7 +40,7 @@ public:
   COsKeyState GetOsKeyState(int key) const;
 
   void* AllocFromArena(size_t sz);
-  
+
   uint GetBaseFreeRam() const {
     size_t hiAddr = reinterpret_cast< size_t >(x1c_arenaHi);
     size_t loAddr = reinterpret_cast< size_t >(x20_arenaLo2);
diff --git a/src/MetroidPrime/main.cpp b/src/MetroidPrime/main.cpp
index c08884f9..9f70ef8a 100644
--- a/src/MetroidPrime/main.cpp
+++ b/src/MetroidPrime/main.cpp
@@ -74,7 +74,7 @@ CInGameTweakManager* gpTweakManager;
 unkptr gpDefaultFont;
 unkptr lbl_805A8C50;
 unkptr lbl_805A8C54;
-bool mProgressiveMode__10COsContext;
+bool COsContext::mProgressiveMode;
 u32 sARAMMemArray[2];
 f32 sInfiniteLoopTime;
 
@@ -681,9 +681,10 @@ int CMain::RsMain(int argc, const char* const* argv) {
         break;
       bool needsReset = false;
       if (archSupport->GetIOWinManager().IsEmpty()) {
-        // rs_log_print
+        // rs_log_print("IOWinManager got empty. Resetting game architecture\n");
         needsReset = true;
       } else if (CheckReset()) {
+        // rs_log_print("Reset pressed...\n");
         needsReset = true;
       }
       if (needsReset) {