diff --git a/src/ZoneCode/Game/T6/T6_Commands.txt b/src/ZoneCode/Game/T6/T6_Commands.txt
index c1d7e49a..91b19ce6 100644
--- a/src/ZoneCode/Game/T6/T6_Commands.txt
+++ b/src/ZoneCode/Game/T6/T6_Commands.txt
@@ -294,9 +294,9 @@ set count stateBitsTable stateBitsCount;
 
 // GfxStateBits
 use GfxStateBits;
-set count blendState 0;
-set count depthStencilState 0;
-set count rasterizerState 0;
+set condition blendState never;
+set condition depthStencilState never;
+set condition rasterizerState never;
 
 // =========================================
 // MaterialTechniqueSet
@@ -327,13 +327,13 @@ reorder:
     args;
 
 // MaterialVertexStreamRouting
-set count MaterialVertexStreamRouting::decl 0;
+set condition MaterialVertexStreamRouting::decl never;
 
 // MaterialVertexShader
 set string MaterialVertexShader::name;
 
 // MaterialVertexShaderProgram
-set count MaterialVertexShaderProgram::vs 0;
+set condition MaterialVertexShaderProgram::vs never;
 
 // GfxVertexShaderLoadDef
 set count GfxVertexShaderLoadDef::program programSize;
@@ -342,7 +342,7 @@ set count GfxVertexShaderLoadDef::program programSize;
 set string MaterialPixelShader::name;
 
 // MaterialPixelShaderProgram
-set count MaterialPixelShaderProgram::ps 0;
+set condition MaterialPixelShaderProgram::ps never;
 
 // GfxPixelShaderLoadDef
 set count GfxPixelShaderLoadDef::program programSize;
@@ -359,6 +359,7 @@ set reusable u::literalConst;
 use GfxImage;
 set string name;
 set name name;
+set condition pixels never;
 reorder:
     name
     texture;
diff --git a/src/ZoneCommon/Game/T6/T6_Assets.h b/src/ZoneCommon/Game/T6/T6_Assets.h
index eff06e8a..d7aebbbc 100644
--- a/src/ZoneCommon/Game/T6/T6_Assets.h
+++ b/src/ZoneCommon/Game/T6/T6_Assets.h
@@ -2664,7 +2664,7 @@ namespace T6
     };
 
 
-    struct MaterialConstantDef
+    struct __declspec(align(16)) MaterialConstantDef
     {
         unsigned int nameHash;
         char name[12];