diff --git a/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp b/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
index 0a282067..a5473e1e 100644
--- a/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
+++ b/src/ObjLoading/Game/T6/BSP/BSPUtil.cpp
@@ -88,7 +88,7 @@ vec3_t BSPUtil::calcHalfSizeOfAABB(vec3_t& mins, vec3_t& maxs)
     return result;
 }
 
-int BSPUtil::allignBy128(int size)
+size_t BSPUtil::allignBy128(size_t size)
 {
     return ((size + 127) & 0xFFFFFF80);
 }
diff --git a/src/ObjLoading/Game/T6/BSP/BSPUtil.h b/src/ObjLoading/Game/T6/BSP/BSPUtil.h
index 474d51c1..074cd4ab 100644
--- a/src/ObjLoading/Game/T6/BSP/BSPUtil.h
+++ b/src/ObjLoading/Game/T6/BSP/BSPUtil.h
@@ -13,7 +13,7 @@ public:
     static void updateAABBWithPoint(vec3_t& point, vec3_t& AABBMins, vec3_t& AABBMaxs);
     static vec3_t calcMiddleOfAABB(vec3_t& mins, vec3_t& maxs);
     static vec3_t calcHalfSizeOfAABB(vec3_t& mins, vec3_t& maxs);
-    static int allignBy128(int size);
+    static size_t allignBy128(size_t size);
     static float distBetweenPoints(vec3_t& p1, vec3_t& p2);
     static void convertAnglesToAxis(vec3_t* angles, vec3_t* axis);
     static void matrixTranspose3x3(const vec3_t* in, vec3_t* out);
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
index aee90d7c..8289c1a4 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
@@ -462,7 +462,7 @@ namespace BSP
         //  any vertex count over the uint16_t max means the vertices above the uint16_t max can't be indexed
         if (static_cast<unsigned int>(bsp->colWorld.vertices.size()) > BSPGameConstants::MAX_COLLISION_VERTS)
         {
-            printf("ERROR: collision vertex count %i exceeds the maximum number: %i!\n", clipMap->vertCount, BSPGameConstants::MAX_COLLISION_VERTS);
+            con::error("ERROR: collision vertex count %i exceeds the maximum number: %i!\n", clipMap->vertCount, BSPGameConstants::MAX_COLLISION_VERTS);
             return false;
         }
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
index 223f57c4..813a8b56 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
@@ -130,18 +130,18 @@ namespace BSP
 
         // set all surface types to lit opaque
         gfxWorld->dpvs.litSurfsBegin = 0;
-        gfxWorld->dpvs.litSurfsEnd = surfaceCount;
-        gfxWorld->dpvs.emissiveOpaqueSurfsBegin = surfaceCount;
-        gfxWorld->dpvs.emissiveOpaqueSurfsEnd = surfaceCount;
-        gfxWorld->dpvs.emissiveTransSurfsBegin = surfaceCount;
-        gfxWorld->dpvs.emissiveTransSurfsEnd = surfaceCount;
-        gfxWorld->dpvs.litTransSurfsBegin = surfaceCount;
-        gfxWorld->dpvs.litTransSurfsEnd = surfaceCount;
+        gfxWorld->dpvs.litSurfsEnd = static_cast<unsigned int>(surfaceCount);
+        gfxWorld->dpvs.emissiveOpaqueSurfsBegin = static_cast<unsigned int>(surfaceCount);
+        gfxWorld->dpvs.emissiveOpaqueSurfsEnd = static_cast<unsigned int>(surfaceCount);
+        gfxWorld->dpvs.emissiveTransSurfsBegin = static_cast<unsigned int>(surfaceCount);
+        gfxWorld->dpvs.emissiveTransSurfsEnd = static_cast<unsigned int>(surfaceCount);
+        gfxWorld->dpvs.litTransSurfsBegin = static_cast<unsigned int>(surfaceCount);
+        gfxWorld->dpvs.litTransSurfsEnd = static_cast<unsigned int>(surfaceCount);
 
         // visdata is written to by the game
         // all visdata is alligned by 128
-        unsigned int allignedSurfaceCount = BSPUtil::allignBy128(surfaceCount);
-        gfxWorld->dpvs.surfaceVisDataCount = allignedSurfaceCount;
+        size_t allignedSurfaceCount = BSPUtil::allignBy128(surfaceCount);
+        gfxWorld->dpvs.surfaceVisDataCount = static_cast<unsigned int>(allignedSurfaceCount);
         gfxWorld->dpvs.surfaceVisData[0] = m_memory.Alloc<char>(allignedSurfaceCount);
         gfxWorld->dpvs.surfaceVisData[1] = m_memory.Alloc<char>(allignedSurfaceCount);
         gfxWorld->dpvs.surfaceVisData[2] = m_memory.Alloc<char>(allignedSurfaceCount);
@@ -228,8 +228,8 @@ namespace BSP
 
         // visdata is written to by the game
         // all visdata is alligned by 128
-        int allignedModelCount = BSPUtil::allignBy128(modelCount);
-        gfxWorld->dpvs.smodelVisDataCount = allignedModelCount;
+        size_t allignedModelCount = BSPUtil::allignBy128(modelCount);
+        gfxWorld->dpvs.smodelVisDataCount = static_cast<unsigned int>(allignedModelCount);
         gfxWorld->dpvs.smodelVisData[0] = m_memory.Alloc<char>(allignedModelCount);
         gfxWorld->dpvs.smodelVisData[1] = m_memory.Alloc<char>(allignedModelCount);
         gfxWorld->dpvs.smodelVisData[2] = m_memory.Alloc<char>(allignedModelCount);
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
index 00459a56..c96f5678 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
@@ -119,7 +119,7 @@ namespace BSP
             mapEnts->name = m_memory.Dup(bsp->bspName.c_str());
 
             mapEnts->entityString = m_memory.Dup(entityString.c_str());
-            mapEnts->numEntityChars = entityString.length() + 1; // numEntityChars includes the null character
+            mapEnts->numEntityChars = static_cast<int>(entityString.length() + 1); // numEntityChars includes the null character
 
             // don't need these
             mapEnts->trigger.count = 0;
diff --git a/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp b/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp
index 630897a0..70f36ac7 100644
--- a/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp
+++ b/src/ObjLoading/Game/T6/BSP/LoaderBSP_T6.cpp
@@ -2,7 +2,6 @@
 #include "BSPCreator.h"
 #include "BSPUtil.h"
 #include "Linker/BSPLinker.h"
-//#include "CustomMapLinker.h"
 
 namespace
 {