diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt
index c116ee5f0..60965e6cf 100644
--- a/Lib/LibStatic/CMakeLists.txt
+++ b/Lib/LibStatic/CMakeLists.txt
@@ -18,9 +18,9 @@ IF(WIN32 AND NOT UNIX)
 	IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles")
 
 		IF( MSVC10 OR MSVC11 OR MSVC12 )
-			set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" )
+			set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:LIBCD.lib LIBCMTD.lib MSVCRT.lib" )
 		ELSE()
-			set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:"LIBCD.lib LIBCMTD.lib MSVCRT.lib"" )
+			set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:LIBCD.lib LIBCMTD.lib MSVCRT.lib" )
 		ENDIF()
 				
 	ENDIF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles")
diff --git a/Source/CCRakNetSlidingWindow.cpp b/Source/CCRakNetSlidingWindow.cpp
index 611c3c02e..ff96a20de 100644
--- a/Source/CCRakNetSlidingWindow.cpp
+++ b/Source/CCRakNetSlidingWindow.cpp
@@ -218,7 +218,7 @@ void CCRakNetSlidingWindow::OnAck(CCTimeType curTime, CCTimeType rtt, bool hasBA
 		double d = .05;
 		double difference = rtt - estimatedRTT;
 		estimatedRTT = estimatedRTT + d * difference;
-		deviationRtt = deviationRtt + d * (abs(difference) - deviationRtt);
+        deviationRtt = deviationRtt + d * (fabs(difference) - deviationRtt);
 	}
 
 	_isContinuousSend=isContinuousSend;
diff --git a/Source/NatPunchthroughClient.cpp b/Source/NatPunchthroughClient.cpp
index 82bb07027..f5219fa29 100644
--- a/Source/NatPunchthroughClient.cpp
+++ b/Source/NatPunchthroughClient.cpp
@@ -797,34 +797,34 @@ char *TestModeToString(NatPunchthroughClient::SendPing::TestMode tm)
 	switch (tm)
 	{
 		case NatPunchthroughClient::SendPing::TESTING_INTERNAL_IPS:
-			return "TESTING_INTERNAL_IPS";
+            return (char *) ("TESTING_INTERNAL_IPS");
 		break;
 		case NatPunchthroughClient::SendPing::WAITING_FOR_INTERNAL_IPS_RESPONSE:
-			return "WAITING_FOR_INTERNAL_IPS_RESPONSE";
+            return (char *) ("WAITING_FOR_INTERNAL_IPS_RESPONSE");
 		break;
 // 		case NatPunchthroughClient::SendPing::SEND_WITH_TTL:
-// 			return "SEND_WITH_TTL";
+// 			return (char *) ("SEND_WITH_TTL");
 // 		break;
 		case NatPunchthroughClient::SendPing::TESTING_EXTERNAL_IPS_FACILITATOR_PORT_TO_FACILITATOR_PORT:
-			return "TESTING_EXTERNAL_IPS_FACILITATOR_PORT_TO_FACILITATOR_PORT";
+            return (char *) ("TESTING_EXTERNAL_IPS_FACILITATOR_PORT_TO_FACILITATOR_PORT");
 		break;
 		case NatPunchthroughClient::SendPing::TESTING_EXTERNAL_IPS_1024_TO_FACILITATOR_PORT:
-			return "TESTING_EXTERNAL_IPS_1024_TO_FACILITATOR_PORT";
+            return (char *) ("TESTING_EXTERNAL_IPS_1024_TO_FACILITATOR_PORT");
 		break;
 		case NatPunchthroughClient::SendPing::TESTING_EXTERNAL_IPS_FACILITATOR_PORT_TO_1024:
-			return "TESTING_EXTERNAL_IPS_FACILITATOR_PORT_TO_1024";
+            return (char *) ("TESTING_EXTERNAL_IPS_FACILITATOR_PORT_TO_1024");
 		break;
 		case NatPunchthroughClient::SendPing::TESTING_EXTERNAL_IPS_1024_TO_1024:
-			return "TESTING_EXTERNAL_IPS_1024_TO_1024";
+            return (char *) ("TESTING_EXTERNAL_IPS_1024_TO_1024");
 		break;
 		case NatPunchthroughClient::SendPing::WAITING_AFTER_ALL_ATTEMPTS:
-			return "WAITING_AFTER_ALL_ATTEMPTS";
+            return (char *) ("WAITING_AFTER_ALL_ATTEMPTS");
 		break;
 		case NatPunchthroughClient::SendPing::PUNCHING_FIXED_PORT:
-			return "PUNCHING_FIXED_PORT";
+            return (char *) ("PUNCHING_FIXED_PORT");
 		break;
 	}
-	return "";
+    return (char *) ("");
 }
 void NatPunchthroughClient::SendOutOfBand(SystemAddress sa, MessageID oobId)
 {
diff --git a/Source/RakString.cpp b/Source/RakString.cpp
index 5d8583ecd..0a5076dd4 100644
--- a/Source/RakString.cpp
+++ b/Source/RakString.cpp
@@ -458,7 +458,7 @@ WCHAR * RakString::ToWideChar(void)
 	if ( (sharedString->c_str == NULL) || (*sharedString->c_str == '\0') )
 	{
 		// Return empty string
-		return L"";
+        return (WCHAR *) (L"");
 	}
 
 	//