diff --git a/src/Common/Game/IW3/IW3_Assets.h b/src/Common/Game/IW3/IW3_Assets.h
index 3959562c..4e27aa9a 100644
--- a/src/Common/Game/IW3/IW3_Assets.h
+++ b/src/Common/Game/IW3/IW3_Assets.h
@@ -257,7 +257,7 @@ namespace IW3
 
     struct type_align(4) XQuat
     {
-        int16_t value[4];
+        int16_t value[2];
     };
 
     union XAnimDynamicIndicesQuat
diff --git a/src/Common/Game/T5/T5_Assets.h b/src/Common/Game/T5/T5_Assets.h
index 8ccbd52a..c1145466 100644
--- a/src/Common/Game/T5/T5_Assets.h
+++ b/src/Common/Game/T5/T5_Assets.h
@@ -387,7 +387,7 @@ namespace T5
 
     struct type_align(4) XQuat
     {
-        int16_t value[4];
+        int16_t value[2];
     };
 
     union XAnimDynamicIndicesQuat
diff --git a/src/ZoneLoading/Game/IW3/ZoneLoaderFactoryIW3.cpp b/src/ZoneLoading/Game/IW3/ZoneLoaderFactoryIW3.cpp
index 553fe88c..c7e4e4e4 100644
--- a/src/ZoneLoading/Game/IW3/ZoneLoaderFactoryIW3.cpp
+++ b/src/ZoneLoading/Game/IW3/ZoneLoaderFactoryIW3.cpp
@@ -86,7 +86,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
 
     // Start of the zone content
     zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
-        [&zonePtr](ZoneInputStream& stream)
+        [zonePtr](ZoneInputStream& stream)
         {
             return std::make_unique<ContentLoader>(*zonePtr, stream);
         },
diff --git a/src/ZoneLoading/Game/IW5/ZoneLoaderFactoryIW5.cpp b/src/ZoneLoading/Game/IW5/ZoneLoaderFactoryIW5.cpp
index 162fc445..9482a1cb 100644
--- a/src/ZoneLoading/Game/IW5/ZoneLoaderFactoryIW5.cpp
+++ b/src/ZoneLoading/Game/IW5/ZoneLoaderFactoryIW5.cpp
@@ -185,7 +185,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
 
     // Start of the zone content
     zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
-        [&zonePtr](ZoneInputStream& stream)
+        [zonePtr](ZoneInputStream& stream)
         {
             return std::make_unique<ContentLoader>(*zonePtr, stream);
         },
diff --git a/src/ZoneLoading/Game/T5/ZoneLoaderFactoryT5.cpp b/src/ZoneLoading/Game/T5/ZoneLoaderFactoryT5.cpp
index 23331452..0b96bb58 100644
--- a/src/ZoneLoading/Game/T5/ZoneLoaderFactoryT5.cpp
+++ b/src/ZoneLoading/Game/T5/ZoneLoaderFactoryT5.cpp
@@ -86,7 +86,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
 
     // Start of the zone content
     zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
-        [&zonePtr](ZoneInputStream& stream)
+        [zonePtr](ZoneInputStream& stream)
         {
             return std::make_unique<ContentLoader>(*zonePtr, stream);
         },
diff --git a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
index cdc06d5d..0fb7e43e 100644
--- a/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
+++ b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp
@@ -204,7 +204,7 @@ std::unique_ptr<ZoneLoader> ZoneLoaderFactory::CreateLoaderForHeader(ZoneHeader&
 
     // Start of the zone content
     zoneLoader->AddLoadingStep(step::CreateStepLoadZoneContent(
-        [&zonePtr](ZoneInputStream& stream)
+        [zonePtr](ZoneInputStream& stream)
         {
             return std::make_unique<ContentLoader>(*zonePtr, stream);
         },