diff --git a/source/main.cpp b/source/main.cpp
index 54f6f1f2ca..20c3154ae4 100755
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -442,7 +442,7 @@ static void Render()
 	// Temp GUI message GeeTODO
 	glLoadIdentity();
 	glTranslatef(10, 60, 0);
-	glwprintf( L"%S", g_GUI.TEMPmessage.c_str() );
+	glwprintf( L"%hs", g_GUI.TEMPmessage.c_str() );
 
 	glLoadIdentity();
 	g_GUI.Draw();
@@ -657,7 +657,7 @@ PREVTSC=TSC;
 	// init SDL
 	if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0)
 	{
-		swprintf(err_msg, ERR_MSG_SIZE, L"SDL library initialization failed: %s\n", SDL_GetError());
+		swprintf(err_msg, ERR_MSG_SIZE, L"SDL library initialization failed: %hs\n", SDL_GetError());
 		display_startup_error(err_msg);
 	}
 	atexit(SDL_Quit);
@@ -712,7 +712,7 @@ PREVTSC=TSC;
 
 	if(set_vmode(g_xres, g_yres, 32, !windowed) < 0)
 	{
-		swprintf(err_msg, ERR_MSG_SIZE, L"could not set %dx%d graphics mode: %s\n", g_xres, g_yres, SDL_GetError());
+		swprintf(err_msg, ERR_MSG_SIZE, L"could not set %dx%d graphics mode: %hs\n", g_xres, g_yres, SDL_GetError());
 		display_startup_error(err_msg);
 	}
 
diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp
index d958d28072..0eb8ecd974 100755
--- a/source/ps/CConsole.cpp
+++ b/source/ps/CConsole.cpp
@@ -216,7 +216,7 @@ void CConsole::DrawHistory(void) {
 				glTranslatef(0.0f, (float)m_iFontHeight, 0.0f);
 
 				glPushMatrix();
-					glwprintf(L"%s", Iter->data());
+					glwprintf(L"%ls", Iter->data());
 				glPopMatrix();
 			}
 
@@ -239,7 +239,7 @@ void CConsole::DrawBuffer(void)
 		if (m_iBufferPos==0) DrawCursor();
 
 		for (int i = 0; i < m_iBufferLength; i++){
-				glwprintf(L"%c", m_szBuffer[i]);
+				glwprintf(L"%lc", m_szBuffer[i]);
 				if (m_iBufferPos-1==i) DrawCursor();
 		}
 	glPopMatrix();
@@ -436,7 +436,7 @@ void CConsole::ProcessBuffer(const wchar_t* szLine){
 	std::map<std::wstring, fptr>::iterator Iter;
 
 	if (szLine[0] == '\\'){
-		swscanf(szLine, L"\\%s", szCommand);
+		swscanf(szLine, L"\\%ls", szCommand);
 		Trim(szCommand);
 		ToLower(szCommand);
 
@@ -454,13 +454,13 @@ void CConsole::ProcessBuffer(const wchar_t* szLine){
 			if (!m_mapFuncList.size()) InsertMessage(L"   (none registered)");
 
 			for (Iter = m_mapFuncList.begin(); Iter != m_mapFuncList.end(); Iter++)
-				InsertMessage(L"   \\%s", Iter->first.data());
+				InsertMessage(L"   \\%ls", Iter->first.data());
 
 			InsertMessage(L"");
 		}else{
 			Iter = m_mapFuncList.find(szCommand);
 			if (Iter == m_mapFuncList.end())
-				InsertMessage(L"unknown command <%s>", szCommand);
+				InsertMessage(L"unknown command <%ls>", szCommand);
 			else
 				Iter->second();
 		}
@@ -491,11 +491,11 @@ void CConsole::ProcessBuffer(const wchar_t* szLine){
 
 		jsval rval = g_ScriptingHost.ExecuteScript( szMBLine + 1 );
 		if( rval )
-			InsertMessage( L"%S", g_ScriptingHost.ValueToString( rval ).c_str() );
+			InsertMessage( L"%hs", g_ScriptingHost.ValueToString( rval ).c_str() );
 
 		delete[] szMBLine;
 	}
-	else InsertMessage(L"<say>: %s", szLine);
+	else InsertMessage(L"<say>: %ls", szLine);
 
 	delete[] szCommand;
 }
diff --git a/source/ps/CLogger.cpp b/source/ps/CLogger.cpp
index 8d04c57da8..2b795cdc07 100755
--- a/source/ps/CLogger.cpp
+++ b/source/ps/CLogger.cpp
@@ -89,7 +89,7 @@ CLogger::~CLogger ()
 void CLogger::WriteMessage(const char *message)
 {
 #ifdef CONSOLE_DEBUG
-	g_Console->InsertMessage(L"LOG: %S", message);
+	g_Console->InsertMessage(L"LOG: %hs", message);
 #endif
 	m_NumberOfMessages++;
 	m_MainLog << "<P>" << message << "</P>";
@@ -101,7 +101,7 @@ void CLogger::WriteMessage(const char *message)
 void CLogger::WriteError(const char *message)
 {
 #ifdef CONSOLE_DEBUG
-	g_Console->InsertMessage(L"ERROR: %S", message);
+	g_Console->InsertMessage(L"ERROR: %hs", message);
 #endif
 	debug_out("ERROR: %s\n", message);
 	m_NumberOfErrors++;
@@ -112,7 +112,7 @@ void CLogger::WriteError(const char *message)
 void CLogger::WriteWarning(const char *message)
 {
 #ifdef CONSOLE_DEBUG
-	g_Console->InsertMessage(L"WARNING: %S", message);
+	g_Console->InsertMessage(L"WARNING: %hs", message);
 #endif
 	m_NumberOfWarnings++;
 	m_MainLog << "<P class=\"warning\">WARNING: "<< message << "</P>\n";
diff --git a/source/scripting/ScriptGlue.cpp b/source/scripting/ScriptGlue.cpp
index 4524dbeb38..326e026f35 100755
--- a/source/scripting/ScriptGlue.cpp
+++ b/source/scripting/ScriptGlue.cpp
@@ -71,7 +71,7 @@ JSBool writeConsole( JSContext* context, JSObject* globalObject, unsigned int ar
 {
 	assert( argc >= 1 );
 	CStr output = g_ScriptingHost.ValueToString( argv[0] );
-	g_Console->InsertMessage( L"%S", (const char*)output );
+	g_Console->InsertMessage( L"%hs", (const char*)output );
 	return( JS_TRUE );
 }
 
diff --git a/source/scripting/ScriptingHost.cpp b/source/scripting/ScriptingHost.cpp
index c9ecc27daf..37bdd86bb2 100755
--- a/source/scripting/ScriptingHost.cpp
+++ b/source/scripting/ScriptingHost.cpp
@@ -318,10 +318,10 @@ void ScriptingHost::ErrorReporter(JSContext * context, const char * message, JSE
 
 	if (g_Console)
 	{
-		g_Console->InsertMessage( L"%S ( %d )", report->filename, report->lineno );
+		g_Console->InsertMessage( L"%hs ( %d )", report->filename, report->lineno );
 		if( message )
 		{
-			g_Console->InsertMessage( L"%S", message );
+			g_Console->InsertMessage( L"%hs", message );
 		}
 		else
 			g_Console->InsertMessage( L"No error message available" );