diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index a3f2076e44..1e71abb1ba 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -451,7 +451,7 @@ bool Song::LoadSongInfoFromDWIFile( CString sPath )
 				split( arrayFreezeExpressions[f], "=", arrayFreezeValues );
 				int fIndex = atoi( arrayFreezeValues[0] ) * 2;
 				float fFreezeBeat = StepIndexToBeat( fIndex );
-				float fFreezeSeconds = atof( arrayFreezeValues[1] ) / 1000.0f;
+				float fFreezeSeconds = (float)atof( arrayFreezeValues[1] ) / 1000.0f;
 				
 				FreezeSegment new_seg;
 				new_seg.m_fStartBeat = fFreezeBeat;
@@ -476,7 +476,7 @@ bool Song::LoadSongInfoFromDWIFile( CString sPath )
 				split( arrayBPMChangeExpressions[b], "=", arrayBPMChangeValues );
 				int fIndex = atoi( arrayBPMChangeValues[0] ) * 2;
 				float fBeat = StepIndexToBeat( fIndex );
-				float fNewBPM = atoi( arrayBPMChangeValues[1] );
+				float fNewBPM = (float)atoi( arrayBPMChangeValues[1] );
 				
 				BPMSegment new_seg;
 				new_seg.m_fStartBeat = fBeat;
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index b157efe301..19d91dd14d 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -550,7 +550,8 @@ void SetFullscreen( BOOL bFullscreen )
 
 	if( GAMEINFO )
 	{
-		GAMEINFO->m_GameOptions.m_bIsFullscreen = bFullscreen;
+    if (bFullscreen == 1) GAMEINFO->m_GameOptions.m_bIsFullscreen = true;
+    else GAMEINFO->m_GameOptions.m_bIsFullscreen = false;
 		GAMEINFO->SaveConfigToDisk();
 	}
 }