diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index b26e66bfd3..ba760bc40e 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -1258,7 +1258,7 @@ void NoteDataUtil::AddTapAttacks( NoteData &nd, Song* pSong )
 		attack.fSecsRemaining = 15;
 		attack.sModifier = szAttacks[rand()%ARRAYSIZE(szAttacks)];
 		attack.level = ATTACK_LEVEL_1;
-		nd.SetTapAttackNote( iTrack, BeatToNoteRow(iBeat), attack );
+		nd.SetTapAttackNote( iTrack, BeatToNoteRow(fBeat), attack );
 	}
 }
 
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 1c07c34a12..6f640ac23a 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1239,7 +1239,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 	if( bPlayTicks )
 	{
 		float fSecsPerBeat = 1.f/GAMESTATE->m_fCurBPS;
-		float fSecsToLight = fSecsPerBeat*.2;
+		float fSecsToLight = fSecsPerBeat*.2f;
 		s_fSecsLeftOnUpperLights = fSecsToLight;
 	}
 	else