diff --git a/Avara.xcodeproj/xcshareddata/xcschemes/AvaraTests.xcscheme b/Avara.xcodeproj/xcshareddata/xcschemes/AvaraTests.xcscheme
index 60b9ae87..90204788 100644
--- a/Avara.xcodeproj/xcshareddata/xcschemes/AvaraTests.xcscheme
+++ b/Avara.xcodeproj/xcshareddata/xcschemes/AvaraTests.xcscheme
@@ -36,6 +36,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableAddressSanitizer = "YES"
       enableASanStackUseAfterReturn = "YES"
+      enableUBSanitizer = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -53,6 +54,18 @@
             ReferencedContainer = "container:Avara.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+         <AdditionalOption
+            key = "MallocScribble"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/src/game/CAvaraGame.cpp b/src/game/CAvaraGame.cpp
index 6deb0d1e..05d90a67 100755
--- a/src/game/CAvaraGame.cpp
+++ b/src/game/CAvaraGame.cpp
@@ -143,7 +143,7 @@ void CAvaraGame::IAvaraGame(CAvaraApp *theApp) {
 
     nextPingTime = 0;
 
-    showNewHUD = gApplication->Get<bool>(kShowNewHUD);
+    showNewHUD = gApplication ? gApplication->Get<bool>(kShowNewHUD) : false;
     // CalcGameRect();
 
     // vg = AvaraVGContext();
diff --git a/src/game/CNetManager.cpp b/src/game/CNetManager.cpp
index 55b9eea5..fb3b2ca1 100644
--- a/src/game/CNetManager.cpp
+++ b/src/game/CNetManager.cpp
@@ -1298,7 +1298,7 @@ void CNetManager::UpdateLocalConfig() {
         ? gApplication->Get<float>(kLatencyToleranceTag) / itsGame->fpsScale
         : 0;
     config.frameTime = itsGame->frameTime;
-    config.spawnOrder = gApplication->Get<short>(kSpawnOrder);
+    config.spawnOrder = gApplication ? gApplication->Get<short>(kSpawnOrder) : ksHybrid;
     config.hullType = gApplication ? gApplication->Number(kHullTypeTag) : 0;
     config.hullColor = gApplication
         ? ARGBColor::Parse(gApplication->String(kPlayerHullColorTag))
diff --git a/src/tests.cpp b/src/tests.cpp
index 03b39245..0359ddd2 100644
--- a/src/tests.cpp
+++ b/src/tests.cpp
@@ -43,6 +43,7 @@ class TestPlayerManager : public CPlayerManager {
         FunctionTable &ft = *(this->ft);
         ft.down = ft.up = ft.held = ft.mouseDelta.h = ft.mouseDelta.v = ft.buttonStatus = ft.msgChar = 0;
     }
+    ~TestPlayerManager() {}
     virtual CAbstractPlayer* GetPlayer() { return playa; }
     virtual void SetPlayer(CAbstractPlayer* p) { playa = p; }
     virtual short Slot() { return 0; }