diff --git a/src/Common/Game/IW4/IW4_Assets.h b/src/Common/Game/IW4/IW4_Assets.h
index 7b497c54..09431961 100644
--- a/src/Common/Game/IW4/IW4_Assets.h
+++ b/src/Common/Game/IW4/IW4_Assets.h
@@ -1128,7 +1128,7 @@ namespace IW4
     struct Material
     {
         MaterialInfo info;
-        unsigned char stateBitsEntry[48];
+        char stateBitsEntry[48];
         unsigned char textureCount;
         unsigned char constantCount;
         unsigned char stateBitsCount;
diff --git a/src/ObjCommon/Game/IW4/TechsetConstantsIW4.h b/src/ObjCommon/Game/IW4/TechsetConstantsIW4.h
index 7453aded..9b0a08d8 100644
--- a/src/ObjCommon/Game/IW4/TechsetConstantsIW4.h
+++ b/src/ObjCommon/Game/IW4/TechsetConstantsIW4.h
@@ -818,5 +818,5 @@ namespace IW4
          }},
     });
 
-    inline state_map::StateMapLayout stateMapLayout(std::extent_v<decltype(GfxStateBits::loadBits)>, stateMapEntryLayout, stateMapVarLayout);
+    inline state_map::StateMapLayout stateMapLayout(std::extent_v<decltype(GfxStateBits::loadBits.raw)>, stateMapEntryLayout, stateMapVarLayout);
 } // namespace IW4