diff --git a/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp b/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp
index d17ca51..92b617e 100644
--- a/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp
+++ b/Source/RealtimeMeshComponent/Private/RealtimeMeshSimple.cpp
@@ -768,11 +768,11 @@ namespace RealtimeMesh
 				if (const auto ThisShared = ThisWeak.Pin())
 				{
 					FRealtimeMeshAccessContext AccessContext(ThisShared.ToSharedRef());
-					FRealtimeMeshComplexGeometry ComplexGeometry;
+					FRealtimeMeshComplexGeometry ComplexCollisionGeometry;
 					
-					if (ThisShared->GenerateComplexCollision(AccessContext, ComplexGeometry))
+					if (ThisShared->GenerateComplexCollision(AccessContext, ComplexCollisionGeometry))
 					{
-						CollisionData->ComplexGeometry = MoveTemp(ComplexGeometry);
+						CollisionData->ComplexGeometry = MoveTemp(ComplexCollisionGeometry);
 					}
 
 					auto CollisionUpdateFuture = ThisShared->UpdateCollision(MoveTemp(*CollisionData), UpdateKey);
diff --git a/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h b/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h
index e0085c5..18ae2fd 100644
--- a/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h
+++ b/Source/RealtimeMeshComponent/Public/RealtimeMeshSimple.h
@@ -348,7 +348,7 @@ namespace RealtimeMesh
 
 		virtual void ProcessEndOfFrameUpdates() override;
 
-		friend class URealtimeMeshSimple;
+		friend class ::URealtimeMeshSimple;
 	};
 }
 
diff --git a/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h b/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h
index 6a30d4a..b7f787f 100644
--- a/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h
+++ b/Source/RealtimeMeshComponent/Public/RenderProxy/RealtimeMeshGPUBuffer.h
@@ -214,7 +214,7 @@ namespace RealtimeMesh
 #endif
 				}
 				
-				/*Batcher.QueueUpdateRequest(VertexBufferRHI, UpdateData->GetNumElements() > 0? UpdateData->GetBuffer() : nullptr);
+				Batcher.QueueUpdateRequest(VertexBufferRHI, UpdateData->GetNumElements() > 0? UpdateData->GetBuffer() : nullptr);
 
 #if RMC_ENGINE_BELOW_5_3
 				if (ShaderResourceViewRHI)
diff --git a/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp b/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp
index 5c283e5..0a11762 100644
--- a/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp
+++ b/Source/RealtimeMeshEditor/Private/RealtimeMeshEditor.cpp
@@ -6,6 +6,7 @@
 #include "ComponentAssetBroker.h"
 #include "EngineUtils.h"
 #include "IAssetTools.h"
+#include "Editor.h"
 #include "ToolMenus.h"
 #include "IPluginWardenModule.h"
 #include "RealtimeMeshComponent.h"