diff -r 7aeebcf2ea3c src/c_console.cpp
--- a/src/c_console.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/c_console.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -662,7 +662,7 @@
 	{
 		if (addtype == NEWLINE)
 		{
-			for (int j = 0; j < NUMNOTIFIES-1; ++j)
+			for (unsigned int j = 0; j < NUMNOTIFIES-1; ++j)
 			{
 				NotifyStrings[j] = NotifyStrings[j+1];
 			}
@@ -1093,7 +1093,7 @@
 
 void C_FlushDisplay ()
 {
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < NUMNOTIFIES; i++)
 		NotifyStrings[i].TimeOut = 0;
@@ -1190,7 +1190,8 @@
 		return;
 
 	bool center = (con_centernotify != 0.f);
-	int i, line, lineadv, color, j, skip;
+	unsigned int i;
+	int line, lineadv, color, j, skip;
 	bool canskip;
 	
 	if (gamestate == GS_FULLCONSOLE || gamestate == GS_DEMOSCREEN/* || menuactive != MENU_Off*/)
diff -r 7aeebcf2ea3c src/cl_demo.cpp
--- a/src/cl_demo.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/cl_demo.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -820,7 +820,7 @@
 				error.AppendFormat( "\\cc- %s%s\\c-\n",
 				WadNames[i].GetChars( ), (!i) ? " (IWAD)" : "");
 
-			I_Error( error );
+			I_Error( "%s", error.GetChars() );
 		}
 		else
 		{
diff -r 7aeebcf2ea3c src/cl_main.cpp
--- a/src/cl_main.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/cl_main.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -1479,7 +1479,7 @@
 					Printf ( "The server reports %d pwad(s):\n", numServerPWADs );
 					for( std::list<std::pair<FString, FString> >::iterator i = serverPWADs.begin( ); i != serverPWADs.end( ); ++i )
 						Printf( "PWAD: %s - %s\n", i->first.GetChars(), i->second.GetChars() );
-					Printf ( "You have loaded %d pwad(s):\n", NETWORK_GetPWADList( )->size() );
+					Printf ( "You have loaded %zd pwad(s):\n", NETWORK_GetPWADList( )->size() );
 					for( std::list<std::pair<FString, FString> >::iterator i = NETWORK_GetPWADList( )->begin( ); i != NETWORK_GetPWADList( )->end( ); ++i )
 						Printf( "PWAD: %s - %s\n", i->first.GetChars(), i->second.GetChars() );
 
@@ -3004,7 +3004,7 @@
 #ifdef	_DEBUG
 		if ( pActor == players[consoleplayer].mo )
 		{
-			Printf( "CLIENT_SpawnThing: WARNING! Tried to delete console player's body! lNetID = %d\n", lNetID );
+			Printf( "CLIENT_SpawnThing: WARNING! Tried to delete console player's body! lNetID = %d\n", static_cast<int>(lNetID) );
 			return NULL;
 		}
 #endif
diff -r 7aeebcf2ea3c src/d_net.cpp
--- a/src/d_net.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/d_net.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -2648,7 +2648,7 @@
 
 	for (i = 0; i < MAXPLAYERS; i++)
 		if (playeringame[i])
-			Printf ("% 4d %s\n", /*[BB] currrecvtime[i] - lastrecvtime[i]*/ players[i].ulPing,
+			Printf ("% 4d %s\n", /*[BB] currrecvtime[i] - lastrecvtime[i]*/ static_cast<int>(players[i].ulPing),
 					players[i].userinfo.netname);
 }
 /* [BB] ST has no need for this.
diff -r 7aeebcf2ea3c src/m_options.cpp
--- a/src/m_options.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/m_options.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -3318,7 +3318,7 @@
 	countof(SkirmishItems),
 	0,
 	SkirmishItems,
-	NULL,
+	0,
 	0,
 	0,
 	NULL,
@@ -3598,7 +3598,7 @@
 	countof(BotSetupItems),
 	0,
 	BotSetupItems,
-	NULL,
+	0,
 	0,
 	0,
 	NULL,
@@ -3657,7 +3657,7 @@
 	countof(TeamBotSetupItems),
 	0,
 	TeamBotSetupItems,
-	NULL,
+	0,
 	0,
 	0,
 	NULL,
diff -r 7aeebcf2ea3c src/networkshared.h
--- a/src/networkshared.h	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/networkshared.h	Mon Jan 06 18:05:57 2014 +0100
@@ -455,7 +455,7 @@
 	void put ( DataType Entry )
 	{
 		_data[_position] = Entry;
-		_position = ( ++_position % Length );
+		_position = (_position+1) % Length;
 	}
 	DataType getOldestEntry ( unsigned int Offset = 0 ) const
 	{
diff -r 7aeebcf2ea3c src/p_acs.cpp
--- a/src/p_acs.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/p_acs.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -1987,7 +1987,7 @@
 			if (( NETWORK_GetState( ) == NETSTATE_SERVER ) &&
 				ACS_IsScriptClientSide( ptr ))
 			{
-				SERVERCOMMANDS_ACSScriptExecute( ptr->Number, activator, NULL, level.mapname, 0, arg1, 0, 0, always );
+				SERVERCOMMANDS_ACSScriptExecute( ptr->Number, activator, 0, level.mapname, 0, arg1, 0, 0, always );
 				continue;
 			}
 
diff -r 7aeebcf2ea3c src/p_interaction.cpp
--- a/src/p_interaction.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/p_interaction.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -2540,7 +2540,7 @@
 
 	// [BB] If the spectator used the chasecam or noclip cheat (which is always allowed for spectators)
 	// remove it now that he joins the game.
-	if ( pPlayer->cheats & CF_CHASECAM|CF_NOCLIP )
+	if ( pPlayer->cheats & (CF_CHASECAM|CF_NOCLIP) )
 	{
 		pPlayer->cheats &= ~(CF_CHASECAM|CF_NOCLIP);
 		if ( NETWORK_GetState() == NETSTATE_SERVER  )
diff -r 7aeebcf2ea3c src/sv_ban.cpp
--- a/src/sv_ban.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/sv_ban.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -203,7 +203,7 @@
 		const char		*pszBan = NETWORK_ReadString( pByteStream );
 		std::string		Message;
 
-		g_MasterServerBans.addEntry( pszBan, "", "", Message, NULL );
+		g_MasterServerBans.addEntry( pszBan, "", "", Message, 0 );
 	}
 
 	// Read the list of exemptions.
@@ -212,7 +212,7 @@
 		const char		*pszBan = NETWORK_ReadString( pByteStream );
 		std::string		Message;
 
-		g_MasterServerBanExemptions.addEntry( pszBan, "", "", Message, NULL );
+		g_MasterServerBanExemptions.addEntry( pszBan, "", "", Message, 0 );
 	}
 
 	// [BB] If we are enforcing the master bans, make sure newly master bannded players are kicked now.
@@ -255,9 +255,9 @@
 				std::string Message;
 
 				if ( lCommand == MSB_BAN )
-					g_MasterServerBans.addEntry( pszBan, "", "", Message, NULL );
+					g_MasterServerBans.addEntry( pszBan, "", "", Message, 0 );
 				else
-					g_MasterServerBanExemptions.addEntry( pszBan, "", "", Message, NULL );
+					g_MasterServerBanExemptions.addEntry( pszBan, "", "", Message, 0 );
 			}
 			break;
 
@@ -289,11 +289,11 @@
 
 	// If the ban is permanent, use NULL.
 	if ( stricmp( szLengthString, "perm" ) == 0 )
-		return NULL;
+		return 0;
 	else
 	{		
 		time( &tNow );
-		tExpiration = NULL;
+		tExpiration = 0;
 
 		// Now we check for patterns in the string.
 
@@ -482,7 +482,7 @@
 
 	// Not found, or bad format.
 	else
-		return NULL;
+		return 0;
 }
 
 //--------------------------------------------------------------------------------------------------------------------------------------------------
@@ -648,7 +648,7 @@
 	}
 
 	std::string message;
-	g_ServerBanExemptions.addEntry( argv[1], NULL, (argv.argc( ) >= 3) ? argv[2] : NULL, message, NULL );
+	g_ServerBanExemptions.addEntry( argv[1], NULL, (argv.argc( ) >= 3) ? argv[2] : NULL, message, 0 );
 	Printf( "addbanexemption: %s", message.c_str() );
 }
 
diff -r 7aeebcf2ea3c src/team.cpp
--- a/src/team.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/team.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -114,9 +114,9 @@
 		TEAM_SetAnnouncedLeadState( i, false );
 		TEAM_SetAssistPlayer( i, MAXPLAYERS );
 
-		teams[i].g_Origin.x = NULL;
-		teams[i].g_Origin.y = NULL;
-		teams[i].g_Origin.z = NULL;
+		teams[i].g_Origin.x = 0;
+		teams[i].g_Origin.y = 0;
+		teams[i].g_Origin.z = 0;
 
 		switch ( i )
 		{
@@ -178,9 +178,9 @@
 		TEAM_SetAnnouncedLeadState( i, false );
 		TEAM_SetAssistPlayer( i, MAXPLAYERS );
 
-		teams[i].g_Origin.x = NULL;
-		teams[i].g_Origin.y = NULL;
-		teams[i].g_Origin.z = NULL;
+		teams[i].g_Origin.x = 0;
+		teams[i].g_Origin.y = 0;
+		teams[i].g_Origin.z = 0;
 
 		switch ( i )
 		{
@@ -932,7 +932,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lPlayerColor );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -991,7 +991,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lRailColor );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1009,7 +1009,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lScore );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1251,7 +1251,7 @@
 	else if ( ulTeamIdx == teams.Size( ) )
 		return ( g_ulWhiteFlagReturnTicks );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1275,7 +1275,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lFragCount );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1314,7 +1314,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lDeathCount );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1335,7 +1335,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lWinCount );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
diff -r 7aeebcf2ea3c upnpnat/upnpnat.cpp
--- a/upnpnat/upnpnat.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/upnpnat/upnpnat.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -106,7 +106,7 @@
 *******************************************************************/
 #define HTTP_HEADER_ACTION "POST %s HTTP/1.1\r\n"                         \
                            "HOST: %s:%u\r\n"                                  \
-                           "Content-Length: %d \r\n" \
+                           "Content-Length: %zu \r\n" \
                            "CONTENT-TYPE: text/xml\r\n"             \
                            "SOAPACTION:\"%s#%s\"\r\n"   \
 						   "\r\n"