diff --git a/src/Common/Game/T5/T5_Assets.h b/src/Common/Game/T5/T5_Assets.h
index 2d29e9c1..65e8e1f6 100644
--- a/src/Common/Game/T5/T5_Assets.h
+++ b/src/Common/Game/T5/T5_Assets.h
@@ -1448,8 +1448,8 @@ namespace T5
     struct MaterialArgumentCodeConst
     {
         uint16_t index;
-        char firstRow;
-        char rowCount;
+        unsigned char firstRow;
+        unsigned char rowCount;
     };
 
     union MaterialArgumentDef
@@ -1465,11 +1465,15 @@ namespace T5
         MTL_ARG_MATERIAL_VERTEX_CONST = 0x0,
         MTL_ARG_LITERAL_VERTEX_CONST = 0x1,
         MTL_ARG_MATERIAL_PIXEL_SAMPLER = 0x2,
+
         MTL_ARG_CODE_PRIM_BEGIN = 0x3,
+
         MTL_ARG_CODE_VERTEX_CONST = 0x3,
         MTL_ARG_CODE_PIXEL_SAMPLER = 0x4,
         MTL_ARG_CODE_PIXEL_CONST = 0x5,
+
         MTL_ARG_CODE_PRIM_END = 0x6,
+
         MTL_ARG_MATERIAL_PIXEL_CONST = 0x6,
         MTL_ARG_LITERAL_PIXEL_CONST = 0x7,
 
diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h
index 07838f09..4bab9c89 100644
--- a/src/Common/Game/T6/T6_Assets.h
+++ b/src/Common/Game/T6/T6_Assets.h
@@ -3001,6 +3001,15 @@ namespace T6
         VERTEX_SHADER_MODEL_UNLIT,
     };
 
+    enum CustomSamplers
+    {
+        CUSTOM_SAMPLER_REFLECTION_PROBE = 0,
+        CUSTOM_SAMPLER_LIGHTMAP_PRIMARY,
+        CUSTOM_SAMPLER_LIGHTMAP_SECONDARY,
+
+        CUSTOM_SAMPLER_COUNT
+    };
+
     enum MaterialType : unsigned char
     {
         MTL_TYPE_DEFAULT = 0x0,
@@ -3035,6 +3044,20 @@ namespace T6
         MaterialShaderArgument* args;
     };
 
+    enum TechniqueFlags
+    {
+        TECHNIQUE_FLAG_1 = 0x1,
+        TECHNIQUE_FLAG_2 = 0x2,
+        TECHNIQUE_FLAG_4 = 0x4,
+        TECHNIQUE_FLAG_8 = 0x8,
+        TECHNIQUE_FLAG_10 = 0x10,
+        TECHNIQUE_FLAG_20 = 0x20,
+        TECHNIQUE_FLAG_40 = 0x40,
+        TECHNIQUE_FLAG_80 = 0x80,
+        TECHNIQUE_FLAG_100 = 0x100,
+        TECHNIQUE_FLAG_200 = 0x200,
+    };
+
     struct MaterialTechnique
     {
         const char* name;
@@ -3043,14 +3066,6 @@ namespace T6
         MaterialPass passArray[1];
     };
 
-    /* struct __cppobj ID3D11View : ID3D11DeviceChild
-    {
-    };*/
-
-    /* struct __cppobj ID3D11ShaderResourceView : ID3D11View
-    {
-    };*/
-
     struct type_align32(4) GfxImageLoadDef
     {
         char levelCount;
@@ -3719,14 +3734,6 @@ namespace T6
         GfxImage* secondary;
     };
 
-    /* struct __cppobj ID3D11Resource : ID3D11DeviceChild
-    {
-    };*/
-
-    /* struct __cppobj ID3D11Buffer : ID3D11Resource
-    {
-    };*/
-
     struct type_align(4) GfxLightGridEntry
     {
         uint16_t colorsIndex;
@@ -5793,8 +5800,8 @@ namespace T6
 
     struct MaterialStreamRouting
     {
-        char source;
-        char dest;
+        unsigned char source;
+        unsigned char dest;
     };
 
     struct MaterialVertexStreamRouting
@@ -5805,7 +5812,7 @@ namespace T6
 
     struct MaterialVertexDeclaration
     {
-        char streamCount;
+        unsigned char streamCount;
         bool hasOptionalSource;
         bool isLoaded;
         MaterialVertexStreamRouting routing;
@@ -6160,8 +6167,8 @@ namespace T6
     struct MaterialArgumentCodeConst
     {
         uint16_t index;
-        char firstRow;
-        char rowCount;
+        unsigned char firstRow;
+        unsigned char rowCount;
     };
 
     union MaterialArgumentDef
@@ -6177,14 +6184,19 @@ namespace T6
         MTL_ARG_MATERIAL_VERTEX_CONST = 0x0,
         MTL_ARG_LITERAL_VERTEX_CONST = 0x1,
         MTL_ARG_MATERIAL_PIXEL_SAMPLER = 0x2,
+
         MTL_ARG_CODE_PRIM_BEGIN = 0x3,
+
         MTL_ARG_CODE_VERTEX_CONST = 0x3,
         MTL_ARG_CODE_PIXEL_SAMPLER = 0x4,
         MTL_ARG_CODE_PIXEL_CONST = 0x5,
+
         MTL_ARG_CODE_PRIM_END = 0x6,
+
         MTL_ARG_MATERIAL_PIXEL_CONST = 0x6,
         MTL_ARG_LITERAL_PIXEL_CONST = 0x7,
-        MLT_ARG_COUNT = 0x8,
+
+        MLT_ARG_COUNT,
     };
 
     struct MaterialShaderArgument
@@ -6895,10 +6907,6 @@ namespace T6
         vec3_t halfLengths;
     };
 
-    /* struct __cppobj ID3D11InputLayout : ID3D11DeviceChild
-    {
-    };*/
-
     struct GfxLightRegionAxis
     {
         vec3_t dir;
diff --git a/src/Common/Techset/StateMap/StateMapLayout.h b/src/Common/Techset/StateMap/StateMapLayout.h
index 9bcb6166..811f80de 100644
--- a/src/Common/Techset/StateMap/StateMapLayout.h
+++ b/src/Common/Techset/StateMap/StateMapLayout.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <cstddef>
 #include <string>
 #include <vector>