diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp
index 9214cd4..b03424e 100644
--- a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp
+++ b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp
@@ -15,8 +15,16 @@ FCogDebugSettings FCogDebug::Settings = FCogDebugSettings();
 //--------------------------------------------------------------------------------------------------------------------------
 FCogDebugContext& FCogDebug::Get(const int32 InPieId)
 {
+    if (InPieId == INDEX_NONE)
+    {
+        if (FCogDebugContext* Context = DebugContexts.Find(1))
+        {
+            return *Context;
+        }
+    }
+
     FCogDebugContext& Context = DebugContexts.FindOrAdd(InPieId);
-    return Context;
+    return Context;  
 }
 
 //--------------------------------------------------------------------------------------------------------------------------
diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h
index a436fd0..613d474 100644
--- a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h
+++ b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h
@@ -72,7 +72,7 @@ struct COGDEBUG_API FCogDebug
     static void GetDebugDrawSweepSettings(FCogDebugDrawSweepParams& Params);
 
     static FCogDebugContext& Get(int32 InPieId);
-    
+
     static FCogDebugContext& Get();
 
     static int32 GetPieSessionId();
diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp
index ca1ae50..0398cae 100644
--- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp
+++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp
@@ -62,7 +62,8 @@ void FCogEngineWindow_Cheats::Initialize()
                     const bool ApplyToAllies = InArgs.Contains("-Allies");
                     const bool ApplyToControlled = InArgs.Contains("-Controlled");
 
-                    RequestCheat(*Replicator, GetLocalPlayerPawn(), GetSelection(), *Cheat, ApplyToEnemies, ApplyToAllies, ApplyToControlled);
+                    AActor* Selection = GetSelection();
+                    RequestCheat(*Replicator, GetLocalPlayerPawn(), Selection, *Cheat, ApplyToEnemies, ApplyToAllies, ApplyToControlled);
                 }
             }));