diff --git a/Source/UniversalLogging/Private/LogStream.cpp b/Source/UniversalLogging/Private/LogStream.cpp
index 94dd5deb6c47e0c54eae577b06687569b88b20e2..23a1778f79187321a5e753ac7fe645241f2f4c5e 100644
--- a/Source/UniversalLogging/Private/LogStream.cpp
+++ b/Source/UniversalLogging/Private/LogStream.cpp
@@ -4,8 +4,8 @@
 #include "UniversalLogging.h"
 
 #include "HAL/PlatformFilemanager.h"
-#include "Paths.h"
-#include "IPlatformFileProfilerWrapper.h"
+#include "Misc/Paths.h"
+#include "HAL/IPlatformFileProfilerWrapper.h"
 
 LogStreamImpl::LogStreamImpl(const FString Filepath, const FString Filename, const bool bPer_Session, const bool bLogOnMaster, const bool bLogOnSlaves)
   : Filepath(Filepath)
diff --git a/Source/UniversalLogging/Private/LogStream.h b/Source/UniversalLogging/Private/LogStream.h
index f9ff32335bbcc21f7adebf46920e1522187742a6..7c250a2e3523a634e6c41afc5d067fa275e20853 100644
--- a/Source/UniversalLogging/Private/LogStream.h
+++ b/Source/UniversalLogging/Private/LogStream.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "Color.h"
+#include "Math/Color.h"
 
 class LogStreamImpl : public ILogStream
 {
diff --git a/Source/UniversalLogging/Private/OnScreenLog.h b/Source/UniversalLogging/Private/OnScreenLog.h
index 0304628e00249c5759235e07c4194ee8eb60b51f..77ce3142caac06696d028cf66e58fec6406ac040 100644
--- a/Source/UniversalLogging/Private/OnScreenLog.h
+++ b/Source/UniversalLogging/Private/OnScreenLog.h
@@ -5,8 +5,8 @@
 #include "CoreMinimal.h"
 #include "Engine/Font.h"
 #include "GameFramework/Actor.h"
-#include "ConstructorHelpers.h"
-#include "Queue.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Containers/Queue.h"
 #include "OnScreenLog.generated.h"
 
 UCLASS()
diff --git a/Source/UniversalLogging/Private/UniversalLogging.cpp b/Source/UniversalLogging/Private/UniversalLogging.cpp
index 543f3b7a4907aece0317576ea38ecc47c5eb5c1e..5f2fbce9b3c331fd800bf0b4c37a83f5f57f6c85 100644
--- a/Source/UniversalLogging/Private/UniversalLogging.cpp
+++ b/Source/UniversalLogging/Private/UniversalLogging.cpp
@@ -1,6 +1,7 @@
+#include "UniversalLogging.h"
+
 #include "UniversalLoggingPrivatePCH.h"
 
-#include "UniversalLogging.h"
 
 #include "LogStream.h"
 #include "GameFramework/PlayerController.h"
@@ -149,6 +150,10 @@ void UniversalLoggingImpl::ResetSessionId(FString Prefix)
 
 bool UniversalLoggingImpl::IsClusterMaster()
 {
+  if (!IDisplayCluster::IsAvailable()) 
+  {
+     return true;
+  }
   IDisplayClusterClusterManager* Manager = IDisplayCluster::Get().GetClusterMgr();
   if (Manager == nullptr)
   {
diff --git a/Source/UniversalLogging/Public/IUniversalLogging.h b/Source/UniversalLogging/Public/IUniversalLogging.h
index f65c4da7024e7670a4c82b251b2a25c12aa8cdd1..c6d052a3036284a17712e53cfa44ec7e1d8ed328 100644
--- a/Source/UniversalLogging/Public/IUniversalLogging.h
+++ b/Source/UniversalLogging/Public/IUniversalLogging.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "ModuleManager.h"
+#include "IDisplayCluster.h"
+#include "Modules/ModuleManager.h"
 
 #include "ILogStream.h"