diff --git a/Src/Inputs/Inputs.cpp b/Src/Inputs/Inputs.cpp
index 42510a8..febc672 100644
--- a/Src/Inputs/Inputs.cpp
+++ b/Src/Inputs/Inputs.cpp
@@ -609,7 +609,7 @@ bool CInputs::ConfigureInputs(const Game *game, unsigned dispX, unsigned dispY,
 
 void CInputs::CalibrateJoysticks()
 {
-	unsigned numJoys = m_system->GetNumJoysticks();
+	int numJoys = m_system->GetNumJoysticks();
 	if (numJoys == 0 || numJoys == ANY_JOYSTICK)
 		puts("No joysticks attached to calibrate!");
 	else
@@ -617,10 +617,10 @@ void CInputs::CalibrateJoysticks()
 		puts("Choose joystick to calibrate (or press Esc to cancel):");
 		if (numJoys > 10)
 			numJoys = 10;
-		for (int joyNum = 0; joyNum < numJoys; joyNum++)
+		for (int i = 0; i < numJoys; i++)
 		{
-			const JoyDetails *joyDetails = m_system->GetJoyDetails(joyNum);
-			unsigned dispNum = (joyNum == 9 ? 0 : joyNum + 1);
+			const JoyDetails *joyDetails = m_system->GetJoyDetails(i);
+			unsigned dispNum = (i == 9 ? 0 : i + 1);
 			printf(" %u: %s\n", dispNum, joyDetails->name);
 		}
 
@@ -632,7 +632,7 @@ void CInputs::CalibrateJoysticks()
 			char c = mapping[4];
 			if (!isdigit(c))
 				continue;
-			unsigned joyNum = c - '0';
+			int joyNum = c - '0';
 			joyNum = (joyNum == 0 ? 9 : joyNum - 1);
 			if (joyNum >= numJoys)
 				continue;
diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp
index 92dfbbf..8fe51f8 100644
--- a/Src/OSD/SDL/Main.cpp
+++ b/Src/OSD/SDL/Main.cpp
@@ -1406,6 +1406,7 @@ static void Help(void)
   puts("  -crosshairs=<n>         Crosshairs configuration for gun games:");
   puts("                           0=none [Default], 1=P1 only, 2=P2 only, 3=P1 & P2");
   puts("  -new3d                  New 3D engine by Ian Curtis [Default]");
+  puts("  -quad-rendering         Enable proper quad rendering");
   puts("  -legacy3d               Legacy 3D engine (faster but less accurate)");
   puts("  -multi-texture          Use 8 texture maps for decoding (legacy engine)");
   puts("  -no-multi-texture       Decode to single texture (legacy engine) [Default]");
diff --git a/Src/OSD/SDL/SDLInputSystem.cpp b/Src/OSD/SDL/SDLInputSystem.cpp
index 6d9164d..2f6eaea 100644
--- a/Src/OSD/SDL/SDLInputSystem.cpp
+++ b/Src/OSD/SDL/SDLInputSystem.cpp
@@ -369,7 +369,7 @@ int CSDLInputSystem::GetNumMice()
 int CSDLInputSystem::GetNumJoysticks()
 {
 	// Return number of joysticks found
-	return m_joysticks.size();
+	return (int)m_joysticks.size();
 }
 
 const KeyDetails *CSDLInputSystem::GetKeyDetails(int kbdNum)
diff --git a/Src/OSD/Windows/DirectInputSystem.cpp b/Src/OSD/Windows/DirectInputSystem.cpp
index d607103..d6a32eb 100644
--- a/Src/OSD/Windows/DirectInputSystem.cpp
+++ b/Src/OSD/Windows/DirectInputSystem.cpp
@@ -1576,7 +1576,7 @@ bool CDirectInputSystem::InitializeSystem()
 		if (m_useRawInput)
 		{
 			// Get screen resolution (needed for absolute mouse devices)
-			DEVMODEA settings;
+			DEVMODEA settings = { 0 };
 			if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &settings))
 			{
 				ErrorLog("Unable to read current display settings\n");