diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 950ef0a73d..cebf1e724c 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -23,11 +23,11 @@ const float PARTICLE_SPEED = 300;
 const float SPIRAL_MAX_ZOOM = 2;
 const float SPIRAL_MIN_ZOOM = 0.3f;
 
-#define MAX_TILES_WIDE (SCREEN_WIDTH/32+2)
-#define MAX_TILES_HIGH (SCREEN_HEIGHT/32+2)
+#define MAX_TILES_WIDE int(SCREEN_WIDTH/32+2)
+#define MAX_TILES_HIGH int(SCREEN_HEIGHT/32+2)
 #define MAX_SPRITES (MAX_TILES_WIDE*MAX_TILES_HIGH)
 
-#define FullScreenRectI RectI(SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM)
+#define FullScreenRectI RectI((int)SCREEN_LEFT,(int)SCREEN_TOP,(int)SCREEN_RIGHT,(int)SCREEN_BOTTOM)
 
 
 BGAnimationLayer::BGAnimationLayer( bool Generic )
@@ -280,7 +280,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( CString sPath )
 			Sprite s;
 			s.Load( sPath );
 			int iSpriteArea = int( s.GetUnzoomedWidth()*s.GetUnzoomedHeight() );
-			const int iMaxArea = SCREEN_WIDTH*SCREEN_HEIGHT;
+			const int iMaxArea = int(SCREEN_WIDTH*SCREEN_HEIGHT);
 			m_iNumParticles = iMaxArea / iSpriteArea;
 			m_iNumParticles = min( m_iNumParticles, MAX_SPRITES );
 
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 9e29d33177..782ab58735 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -305,7 +305,7 @@ ScreenEdit::ScreenEdit( CString sName ) : Screen( sName )
 	m_NoteFieldEdit.SetZoom( 0.5f );
 	m_NoteFieldEdit.Load( &noteData, PLAYER_1, -240, 800, PLAYER_HEIGHT*2 );
 
-	m_rectRecordBack.StretchTo( RectI(SCREEN_LEFT, SCREEN_TOP, SCREEN_RIGHT, SCREEN_BOTTOM) );
+	m_rectRecordBack.StretchTo( RectF(SCREEN_LEFT, SCREEN_TOP, SCREEN_RIGHT, SCREEN_BOTTOM) );
 	m_rectRecordBack.SetDiffuse( RageColor(0,0,0,0) );
 
 	m_NoteFieldRecord.SetXY( EDIT_X, PLAYER_Y );