diff --git a/src/Common/Game/IW5/IW5_Assets.h b/src/Common/Game/IW5/IW5_Assets.h
index 3f3f0331..013735cb 100644
--- a/src/Common/Game/IW5/IW5_Assets.h
+++ b/src/Common/Game/IW5/IW5_Assets.h
@@ -1158,7 +1158,7 @@ namespace IW5
         int partitionIndex;
     };
 
-    struct CollisionAabbTree
+    struct type_align(16) CollisionAabbTree
     {
         float midPoint[3];
         unsigned short materialIndex;
@@ -1694,7 +1694,7 @@ namespace IW5
         unsigned char endVertIndex;
     };
 
-    union FxGlassGeometryData
+    union type_align(4) FxGlassGeometryData
     {
         FxGlassVertex vert;
         FxGlassHoleHeader hole;
diff --git a/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt b/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt
index ae3afdb3..fd9229fa 100644
--- a/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/MapEnts.txt
@@ -11,4 +11,13 @@ set count entityString numEntityChars;
 use MapTriggers;
 set count models count;
 set count hulls hullCount;
-set count slabs slabCount;
\ No newline at end of file
+set count slabs slabCount;
+
+// ClientTriggers
+use ClientTriggers;
+set count triggerString triggerStringLength;
+set count triggerStringOffsets trigger::count;
+set count triggerType trigger::count;
+set count origins trigger::count;
+set count scriptDelay trigger::count;
+set count audioTriggers trigger::count;
\ No newline at end of file
diff --git a/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt b/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt
index 3b7f96ef..64798d62 100644
--- a/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt
+++ b/src/ZoneCode/Game/IW5/XAssets/clipMap_t.txt
@@ -30,6 +30,12 @@ set count dynEntClientList[1] dynEntCount[1];
 set block dynEntCollList XFILE_BLOCK_RUNTIME;
 set count dynEntCollList[0] dynEntCount[0];
 set count dynEntCollList[1] dynEntCount[1];
+reorder:
+...
+cmodels
+smodelNodes
+mapEnts
+stages;
 
 // ClipInfo
 use ClipInfo;
@@ -70,6 +76,11 @@ set count data::leaf::brushes leafBrushCount;
 // CollisionPartition
 set reusable CollisionPartition::borders;
 
+// cmodel_t
+use cmodel_t;
+set block info XFILE_BLOCK_TEMP;
+set reusable info;
+
 // cbrush_t
 use cbrush_t;
 set reusable sides;