diff --git a/src/client/refresh/files/models.c b/src/client/refresh/files/models.c
index 7197b39b..d24feeca 100644
--- a/src/client/refresh/files/models.c
+++ b/src/client/refresh/files/models.c
@@ -1039,7 +1039,7 @@ Mod_LoadModel_Flex(const char *mod_name, const void *buffer, int modfilelen,
 			{
 				int num_mesh_nodes;
 
-				num_mesh_nodes = (pheader->ofs_skins - sizeof(*pheader)) / sizeof(short) / 2;
+				num_mesh_nodes = (pheader->ofs_skins - sizeof(*pheader)) / sizeof(dmdxmesh_t);
 
 				if (version != 3)
 				{
diff --git a/src/common/header/files.h b/src/common/header/files.h
index 52f66513..0d16c122 100644
--- a/src/common/header/files.h
+++ b/src/common/header/files.h
@@ -253,16 +253,16 @@ typedef struct
 
 typedef struct
 {
-	float scale[3];       /* multiply short verts by this */
-	float translate[3];   /* then add this */
+	vec3_t scale;       /* multiply short verts by this */
+	vec3_t translate;   /* then add this */
 	char name[16];        /* frame name from grabbing */
 	dxtrivertx_t verts[1]; /* variable sized */
 } daliasxframe_t;
 
 typedef struct
 {
-	short start;
-	short num;
+	unsigned int start;
+	unsigned int num;
 } dmdxmesh_t;
 
 typedef struct