diff --git a/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp b/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp
index ca4f9fdf..22b8aae8 100644
--- a/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp
+++ b/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp
@@ -2,7 +2,7 @@
 
 MAKE_SIGNATURE(CSoundEmitterSystem_EmitSound, "client.dll", "48 89 5C 24 ? 48 89 6C 24 ? 48 89 74 24 ? 41 56 48 81 EC ? ? ? ? 49 8B D9", 0x0);
 //MAKE_SIGNATURE(S_StartDynamicSound, "engine.dll", "4C 8B DC 57 48 81 EC", 0x0);
-MAKE_SIGNATURE(S_StartSound, "engine.dll", "40 53 48 83 EC ? 48 83 79 ? ? 48 8B D9 75 ? 33 C0", 0x0);
+MAKE_SIGNATURE(S_StartSound, "engine.dll", "40 57 48 81 EC ? ? ? ? 48 83 79", 0x0);
 MAKE_SIGNATURE(CBaseEntity_EmitSound, "client.dll", "48 89 5C 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 48 8B 3D", 0x0);
 
 class IRecipientFilter
diff --git a/Amalgam/src/SDK/Definitions/Main/CModel.h b/Amalgam/src/SDK/Definitions/Main/CModel.h
index 9c50280c..f829d3c3 100644
--- a/Amalgam/src/SDK/Definitions/Main/CModel.h
+++ b/Amalgam/src/SDK/Definitions/Main/CModel.h
@@ -6,7 +6,7 @@
 
 #define	AREA_SOLID 1
 #define	AREA_TRIGGERS 2
-#define NUMSIDES_BOXBRUSH 0xFFFF
+#define NUMSIDES_BOXBRUSH 0xFFFFFFFF
 #define	MAXLIGHTMAPS 4
 
 #define SURFDRAW_NOLIGHT		0x00000001
@@ -384,9 +384,9 @@ struct cnode_t
 
 struct cbrush_t
 {
-	int				contents;
-	unsigned short	numsides;
-	unsigned short	firstbrushside;
+	int contents;
+	int numsides;
+	int firstbrushside;
 
 	inline int GetBox() const { return firstbrushside; }
 	inline void SetBox(int boxID)