diff --git a/amxmodx/util.cpp b/amxmodx/util.cpp
index b1f3516c..891ca91c 100755
--- a/amxmodx/util.cpp
+++ b/amxmodx/util.cpp
@@ -291,7 +291,6 @@ void UTIL_ClientPrint(edict_t *pEntity, int msg_dest, char *msg)
 		MESSAGE_BEGIN(MSG_BROADCAST, gmsgTextMsg);
 	
 	WRITE_BYTE(msg_dest);
-	WRITE_STRING("%s");
 	WRITE_STRING(msg);
 	MESSAGE_END();
 	msg[190] = c;
@@ -307,7 +306,6 @@ void UTIL_ClientSayText(edict_t *pEntity, int sender, char *msg)
 
 	MESSAGE_BEGIN(MSG_ONE, gmsgSayText, NULL, pEntity);
 	WRITE_BYTE(sender);
-	WRITE_STRING("%s");
 	WRITE_STRING(msg);
 	MESSAGE_END();
 	msg[190] = c;
diff --git a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj
index 9f388f28..c0bdfc40 100644
--- a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj
+++ b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj
@@ -146,7 +146,6 @@
     <ClCompile Include="..\..\..\..\public\memtools\MemoryUtils.cpp" />
     <ClCompile Include="..\amxx_api.cpp" />
     <ClCompile Include="..\CstrikeHacks.cpp" />
-    <ClCompile Include="..\CstrikeHLTypeConversion.cpp" />
     <ClCompile Include="..\CstrikeNatives.cpp" />
     <ClCompile Include="..\CstrikePlayer.cpp" />
     <ClCompile Include="..\CstrikeUtils.cpp" />
diff --git a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters
index be95ef31..49059432 100644
--- a/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters
+++ b/dlls/cstrike/cstrike/msvc12/cstrike.vcxproj.filters
@@ -56,9 +56,6 @@
     <ClCompile Include="..\..\..\..\public\sdk\amxxmodule.cpp">
       <Filter>Module SDK\SDK Base</Filter>
     </ClCompile>
-    <ClCompile Include="..\CstrikeHLTypeConversion.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\CstrikePlayer.h">
diff --git a/dlls/geoip/msvc12/geoip.vcxproj b/dlls/geoip/msvc12/geoip.vcxproj
index 64b4c285..c83f8fdd 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj
+++ b/dlls/geoip/msvc12/geoip.vcxproj
@@ -98,7 +98,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\GeoIP2\maxminddb.c" />
+    <ClCompile Include="..\GeoIP2\maxminddb.cpp" />
     <ClCompile Include="..\geoip_main.cpp" />
     <ClCompile Include="..\geoip_natives.cpp" />
     <ClCompile Include="..\geoip_util.cpp" />
diff --git a/dlls/geoip/msvc12/geoip.vcxproj.filters b/dlls/geoip/msvc12/geoip.vcxproj.filters
index 925629bc..c8b800d8 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj.filters
+++ b/dlls/geoip/msvc12/geoip.vcxproj.filters
@@ -23,6 +23,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\GeoIP2\maxminddb.cpp">
+      <Filter>GeoIP2</Filter>
+    </ClCompile>
     <ClCompile Include="..\geoip_util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -35,9 +38,6 @@
     <ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp">
       <Filter>Module SDK\SDK Base</Filter>
     </ClCompile>
-    <ClCompile Include="..\GeoIP2\maxminddb.c">
-      <Filter>GeoIP2</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\GeoIP2\maxminddb.h">