diff --git a/stepmania/src/RageSurfaceUtils.cpp b/stepmania/src/RageSurfaceUtils.cpp
index d5e182e729..5eeb7a80a5 100644
--- a/stepmania/src/RageSurfaceUtils.cpp
+++ b/stepmania/src/RageSurfaceUtils.cpp
@@ -876,13 +876,13 @@ RageSurface *RageSurfaceUtils::PalettizeToGrayscale( const RageSurface *src_surf
 		if( Ivalues == 1 )
 			ScaledI = 255; // if only one intensity value, always fullbright
 		else
-			ScaledI = clamp( lrintf(I * (255.0f / (Ivalues-1))), 0, 255 );
+			ScaledI = clamp( lrintf(I * (255.0f / (Ivalues-1))), 0L, 255L );
 
 		int ScaledA;
 		if( Avalues == 1 )
 			ScaledA = 255; // if only one alpha value, always opaque
 		else
-			ScaledA = clamp( lrintf(A * (255.0f / (Avalues-1))), 0, 255 );
+			ScaledA = clamp( lrintf(A * (255.0f / (Avalues-1))), 0L, 255L );
 
 		RageSurfaceColor c;
 		c.r = uint8_t(ScaledI);
diff --git a/stepmania/src/archutils/Win32/arch_setup.h b/stepmania/src/archutils/Win32/arch_setup.h
index 68d33ab975..1edc17a50c 100644
--- a/stepmania/src/archutils/Win32/arch_setup.h
+++ b/stepmania/src/archutils/Win32/arch_setup.h
@@ -114,7 +114,7 @@ static inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
 
 // MinGW provides us with this function already
 #if !defined(__MINGW32__)
-inline int lrintf( float f )
+inline long int lrintf( float f )
 {
 	int retval;