diff --git a/stepmania/src/ScreenAutoGraphicDetail.cpp b/stepmania/src/ScreenAutoGraphicDetail.cpp
index d0fb3726fc..323d815081 100644
--- a/stepmania/src/ScreenAutoGraphicDetail.cpp
+++ b/stepmania/src/ScreenAutoGraphicDetail.cpp
@@ -76,11 +76,11 @@ ScreenAutoGraphicDetail::ScreenAutoGraphicDetail() : Screen("ScreenAutoGraphicDe
 
 	float fSongBPM = SONG_BPM;
 	float fSongBPS = fSongBPM / 60.f;
-	int iBeatsToPlay = fSongBPS * SECONDS_TO_SHOW;
+	int iBeatsToPlay = int(fSongBPS * SECONDS_TO_SHOW);
 
 	for( int i=0; i<iBeatsToPlay; i++ )
 	{
-		float fBeat = i+2;
+		float fBeat = float(i)+2;
 		int iTrack = i % iNumOfTracks;
 		bool bIsHold = ((i / iNumOfTracks) % 2) == 1;
 		if( bIsHold )
@@ -105,7 +105,7 @@ ScreenAutoGraphicDetail::ScreenAutoGraphicDetail() : Screen("ScreenAutoGraphicDe
 
 		GAMESTATE->m_PlayerController[p] = PC_AUTOPLAY;
 		m_Player[p].Load( (PlayerNumber)p, pND, NULL, NULL, NULL, NULL );
-		m_Player[p].SetX( GAMESTATE->GetCurrentStyleDef()->m_iCenterX[p] );
+		m_Player[p].SetX( (float) GAMESTATE->GetCurrentStyleDef()->m_iCenterX[p] );
 		this->AddChild( &m_Player[p] );
 	}
 
diff --git a/stepmania/src/song.h b/stepmania/src/song.h
index e07f06cc50..6a5ae5b6a4 100644
--- a/stepmania/src/song.h
+++ b/stepmania/src/song.h
@@ -142,8 +142,8 @@ public:
 	float	m_fMusicSampleStartSeconds;
 	float	m_fMusicSampleLengthSeconds;
 	enum { DISPLAY_ACTUAL, DISPLAY_SPECIFIED, DISPLAY_RANDOM } m_DisplayBPMType;
-	int		m_fDisplayBPMMin;
-	int		m_fDisplayBPMMax;	// if a range, then Min != Max
+	float		m_fDisplayBPMMin;
+	float		m_fDisplayBPMMax;	// if a range, then Min != Max
 
 	float GetMusicStartBeat() const;