diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp
index b57651c..2661cdf 100644
--- a/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp
+++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugDrawHelper.cpp
@@ -420,10 +420,10 @@ void FCogDebugDrawHelper::DrawLineTrace(
         End,
         FCogDebug::Settings.ArrowSize,
         HasHits ? Settings.HitColor : Settings.NoHitColor,
-        false,
-        0.0f,
-        FCogDebug::GetDebugDepthPriority(0),
-        FCogDebug::GetDebugThickness(0.0f));
+        Settings.Persistent,
+        Settings.LifeTime,
+        Settings.DepthPriority,
+        Settings.Thickness);
 
     DrawHitResults(World, HitResults, Settings);
 }
@@ -448,10 +448,10 @@ void FCogDebugDrawHelper::DrawSweep(
         End,
         FCogDebug::Settings.ArrowSize,
         Color,
-        false,
-        0.0f,
-        FCogDebug::GetDebugDepthPriority(0),
-        FCogDebug::GetDebugThickness(0.0f));
+        Settings.Persistent,
+        Settings.LifeTime,
+        Settings.DepthPriority,
+        Settings.Thickness);
 
 	DrawShape(World, Shape, Start, Rotation, FVector::OneVector, Color, Settings.Persistent, Settings.LifeTime, Settings.DepthPriority, Settings.Thickness);
 
diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugPlot.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugPlot.cpp
index a287b7d..0cb8e73 100644
--- a/Plugins/Cog/Source/CogDebug/Private/CogDebugPlot.cpp
+++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugPlot.cpp
@@ -1,5 +1,6 @@
 #include "CogDebugPlot.h"
 
+#include "CogDebug.h"
 #include "CogDebugDraw.h"
 #include "CogDebugHelper.h"
 #include "CogImguiHelper.h"
diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp
index 538840c..f0ea6a6 100644
--- a/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp
+++ b/Plugins/Cog/Source/CogDebug/Private/CogDebugReplicator.cpp
@@ -1,5 +1,6 @@
 #include "CogDebugReplicator.h"
 
+#include "CogDebug.h"
 #include "CogDebugDraw.h"
 #include "CogDebugLog.h"
 #include "EngineUtils.h"
diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp
index 15ae3c1..4fc8332 100644
--- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp
+++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Plots.cpp
@@ -227,6 +227,11 @@ void FCogEngineWindow_Plots::RenderPlots(const TArray<FCogDebugPlotEntry*>& Visi
 
                         FCogDebugPlotEntry& Entry = *PlotPtr;
 
+                        if (Entry.Values.empty()) 
+                        {
+                            continue;
+                        }
+
                         if (Entry.CurrentRow == PlotIndex)
                         {
                             //--------------------------------------------------------------------------------