diff --git a/Source/Editor/Cooker/Steps/DeployDataStep.cpp b/Source/Editor/Cooker/Steps/DeployDataStep.cpp
index b5b24c251..775b040de 100644
--- a/Source/Editor/Cooker/Steps/DeployDataStep.cpp
+++ b/Source/Editor/Cooker/Steps/DeployDataStep.cpp
@@ -265,7 +265,7 @@ bool DeployDataStep::Perform(CookingData& data)
                         }
                         if (version.IsEmpty())
                         {
-                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for the current host platform."), maxVer, minVer));
+                            data.Error(String::Format(TEXT("Failed to find supported .NET {} version (min {}) for {} platform."), maxVer, minVer, platformName));
                             return true;
                         }
                     }
diff --git a/Source/Engine/Physics/Colliders/Collider.cpp b/Source/Engine/Physics/Colliders/Collider.cpp
index 6980fc4e6..96bd9c7ae 100644
--- a/Source/Engine/Physics/Colliders/Collider.cpp
+++ b/Source/Engine/Physics/Colliders/Collider.cpp
@@ -194,7 +194,6 @@ void Collider::UpdateLayerBits()
     // Own layer mask
     const uint32 mask1 = Physics::LayerMasks[GetLayer()];
 
-    ASSERT(_shape);
     PhysicsBackend::SetShapeFilterMask(_shape, mask0, mask1);
 }
 
diff --git a/Source/Engine/Physics/PhysicsBackendEmpty.cpp b/Source/Engine/Physics/PhysicsBackendEmpty.cpp
index 2e816157b..03973e6fd 100644
--- a/Source/Engine/Physics/PhysicsBackendEmpty.cpp
+++ b/Source/Engine/Physics/PhysicsBackendEmpty.cpp
@@ -3,6 +3,7 @@
 #if COMPILE_WITH_EMPTY_PHYSICS
 
 #include "Engine/Core/Log.h"
+#include "Engine/Physics/PhysicsBackend.h"
 #include "Engine/Physics/CollisionData.h"
 #include "Engine/Physics/PhysicalMaterial.h"
 #include "Engine/Physics/PhysicsScene.h"
@@ -226,26 +227,6 @@ bool PhysicsBackend::CheckConvex(void* scene, const Vector3& center, const Colli
     return false;
 }
 
-bool PhysicsBackend::OverlapBox(void* scene, const Vector3& center, const Vector3& halfExtents, Array<Collider*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
-{
-    return false;
-}
-
-bool PhysicsBackend::OverlapSphere(void* scene, const Vector3& center, const float radius, Array<Collider*>& results, uint32 layerMask, bool hitTriggers)
-{
-    return false;
-}
-
-bool PhysicsBackend::OverlapCapsule(void* scene, const Vector3& center, const float radius, const float height, Array<Collider*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
-{
-    return false;
-}
-
-bool PhysicsBackend::OverlapConvex(void* scene, const Vector3& center, const CollisionData* convexMesh, const Vector3& scale, Array<Collider*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
-{
-    return false;
-}
-
 bool PhysicsBackend::OverlapBox(void* scene, const Vector3& center, const Vector3& halfExtents, Array<PhysicsColliderActor*>& results, const Quaternion& rotation, uint32 layerMask, bool hitTriggers)
 {
     return false;
@@ -353,7 +334,7 @@ Vector3 PhysicsBackend::GetRigidDynamicActorCenterOfMass(void* actor)
     return Vector3::Zero;
 }
 
-void PhysicsBackend::SetRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value)
+void PhysicsBackend::AddRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value)
 {
 }
 
@@ -698,6 +679,15 @@ void PhysicsBackend::SetControllerStepOffset(void* controller, float value)
 {
 }
 
+Vector3 PhysicsBackend::GetControllerBasePosition(void* controller)
+{
+    return Vector3::Zero;
+}
+
+void PhysicsBackend::SetControllerBasePosition(void* controller, const Vector3& value)
+{
+}
+
 Vector3 PhysicsBackend::GetControllerUpDirection(void* controller)
 {
     return Vector3::Up;
diff --git a/Source/Engine/Scripting/ManagedCLR/MClass.h b/Source/Engine/Scripting/ManagedCLR/MClass.h
index 9484a2c44..61273dae7 100644
--- a/Source/Engine/Scripting/ManagedCLR/MClass.h
+++ b/Source/Engine/Scripting/ManagedCLR/MClass.h
@@ -23,6 +23,10 @@ private:
     StringAnsiView _fullname;
     uint32 _types = 0;
     mutable uint32 _size = 0;
+#else
+    StringAnsiView _name;
+    StringAnsiView _namespace;
+    StringAnsiView _fullname;
 #endif
     MAssembly* _assembly;
 
diff --git a/Source/Engine/Scripting/ManagedCLR/MEvent.h b/Source/Engine/Scripting/ManagedCLR/MEvent.h
index 9d8551774..e5ef1d6df 100644
--- a/Source/Engine/Scripting/ManagedCLR/MEvent.h
+++ b/Source/Engine/Scripting/ManagedCLR/MEvent.h
@@ -19,6 +19,8 @@ protected:
 #elif USE_NETCORE
     void* _handle;
     StringAnsiView _name;
+#else
+    StringAnsiView _name;
 #endif
 
     mutable MMethod* _addMethod;
diff --git a/Source/Engine/Scripting/ManagedCLR/MField.h b/Source/Engine/Scripting/ManagedCLR/MField.h
index 66213d6ab..9ef5271a5 100644
--- a/Source/Engine/Scripting/ManagedCLR/MField.h
+++ b/Source/Engine/Scripting/ManagedCLR/MField.h
@@ -24,6 +24,8 @@ protected:
     void* _type;
     int32 _fieldOffset;
     StringAnsiView _name;
+#else
+    StringAnsiView _name;
 #endif
 
     MClass* _parentClass;
diff --git a/Source/Engine/Scripting/ManagedCLR/MMethod.h b/Source/Engine/Scripting/ManagedCLR/MMethod.h
index 700fa9593..51264d1b8 100644
--- a/Source/Engine/Scripting/ManagedCLR/MMethod.h
+++ b/Source/Engine/Scripting/ManagedCLR/MMethod.h
@@ -30,6 +30,8 @@ protected:
     mutable void* _returnType;
     mutable Array<void*, InlinedAllocation<8>> _parameterTypes;
     void CacheSignature() const;
+#else
+    StringAnsiView _name;
 #endif
     MClass* _parentClass;
     MVisibility _visibility;
diff --git a/Source/Engine/Scripting/ManagedCLR/MProperty.h b/Source/Engine/Scripting/ManagedCLR/MProperty.h
index e48d98375..7ef7e97dd 100644
--- a/Source/Engine/Scripting/ManagedCLR/MProperty.h
+++ b/Source/Engine/Scripting/ManagedCLR/MProperty.h
@@ -22,6 +22,8 @@ protected:
 #elif USE_NETCORE
     void* _handle;
     StringAnsiView _name;
+#else
+    StringAnsiView _name;
 #endif
 
     mutable MMethod* _getMethod;
diff --git a/Source/Engine/Scripting/ScriptingObject.cpp b/Source/Engine/Scripting/ScriptingObject.cpp
index 35bd16eb6..dee97a849 100644
--- a/Source/Engine/Scripting/ScriptingObject.cpp
+++ b/Source/Engine/Scripting/ScriptingObject.cpp
@@ -93,6 +93,8 @@ ScriptingObject::ScriptingObject(const SpawnParams& params)
     : _gcHandle((MGCHandle)params.Managed)
 #elif !COMPILE_WITHOUT_CSHARP
     : _gcHandle(params.Managed ? MCore::GCHandle::New(params.Managed) : 0)
+#else
+    : _gcHandle(0)
 #endif
     , _type(params.Type)
     , _id(params.ID)
diff --git a/Source/Engine/Tools/ModelTool/ModelTool.cpp b/Source/Engine/Tools/ModelTool/ModelTool.cpp
index b3b622942..843822b98 100644
--- a/Source/Engine/Tools/ModelTool/ModelTool.cpp
+++ b/Source/Engine/Tools/ModelTool/ModelTool.cpp
@@ -8,6 +8,7 @@
 #include "Engine/Core/RandomStream.h"
 #include "Engine/Core/Math/Vector3.h"
 #include "Engine/Core/Math/Ray.h"
+#include "Engine/Core/Utilities.h"
 #include "Engine/Platform/ConditionVariable.h"
 #include "Engine/Profiler/Profiler.h"
 #include "Engine/Threading/JobSystem.h"
@@ -27,7 +28,6 @@
 #include "Engine/Serialization/MemoryWriteStream.h"
 #include "Engine/Engine/Units.h"
 #if USE_EDITOR
-#include "Engine/Core/Utilities.h"
 #include "Engine/Core/Types/StringView.h"
 #include "Engine/Core/Types/DateTime.h"
 #include "Engine/Core/Types/TimeSpan.h"