diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 3b8c34ccf5..b8b6ca07b3 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -35,9 +35,9 @@ XToString( EditMenuAction, NUM_EDIT_MENU_ACTIONS );
 XToThemedString( EditMenuAction, NUM_EDIT_MENU_ACTIONS );
 StringToX( EditMenuAction );
 
-static CString ARROWS_X_NAME( size_t i )	{ return ssprintf("Arrows%dX",i+1); }
-static CString ROW_VALUE_X_NAME( size_t i )	{ return ssprintf("RowValue%dX",i+1); }
-static CString ROW_Y_NAME( size_t i )		{ return ssprintf("Row%dY",i+1); }
+static CString ARROWS_X_NAME( size_t i )	{ return ssprintf("Arrows%dX",int(i+1)); }
+static CString ROW_VALUE_X_NAME( size_t i )	{ return ssprintf("RowValue%dX",int(i+1)); }
+static CString ROW_Y_NAME( size_t i )		{ return ssprintf("Row%dY",int(i+1)); }
 
 static ThemeMetric1D<float> ARROWS_X					("EditMenu",ARROWS_X_NAME,NUM_ARROWS);
 static ThemeMetric<RageColor> ARROWS_ENABLED_COLOR		("EditMenu","ArrowsEnabledColor");
diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp
index 3e32424cc4..1097ef4a7a 100644
--- a/stepmania/src/RageMath.cpp
+++ b/stepmania/src/RageMath.cpp
@@ -552,14 +552,14 @@ float RageFastSin( float x )
 	iSampleIndex[1] = iSampleIndex[0]+1;
 
 	float fRemainder = fIndex - iSampleIndex[0];
-	for( int i=0; i<ARRAYSIZE(iSampleIndex); i++ )
+	for( unsigned i=0; i<ARRAYSIZE(iSampleIndex); i++ )
         iSampleIndex[i] %= ARRAYSIZE(table) * 2;
 
 	DEBUG_ASSERT( i>=0 && i<ARRAYSIZE(table)*2 );
 	DEBUG_ASSERT( fRemainder>=0 && fRemainder<=1 );
 
 	float fValue[ARRAYSIZE(iSampleIndex)];
-	for( int i=0; i<ARRAYSIZE(iSampleIndex); i++ )
+	for( unsigned i=0; i<ARRAYSIZE(iSampleIndex); i++ )
 	{
 		int &iSample = iSampleIndex[i];
 		float &fVal = fValue[i];