diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index ec8505568e..5b8f5291d2 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -68,7 +68,7 @@ void InputMapper::AddDefaultMappingsForCurrentGameIfUnmapped()
 struct AutoJoyMapping
 {
 	Game game;
-	char sDeviceDescription[64];
+	const char *sDeviceDescription;
 	bool bIgnoreAxes;
 	int numMappings;
 	struct {
@@ -160,7 +160,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
 				if( gc == GAME_CONTROLLER_INVALID )
 					continue;
 
-				for( unsigned k=0; k<mapping.numMappings; k++ )
+				for( int k=0; k<mapping.numMappings; k++ )
 				{
 					DeviceInput di( device, mapping.mapping[k].deviceButton );
 					GameInput gi( gc, mapping.mapping[k].gb );