diff --git a/src/emu/render.cpp b/src/emu/render.cpp
index 3f84421f69c..1e0e06b760d 100644
--- a/src/emu/render.cpp
+++ b/src/emu/render.cpp
@@ -1225,8 +1225,8 @@ void render_target::compute_visible_area(INT32 target_width, INT32 target_height
 			// first compute scale factors to fit the screen
 			float xscale = (float)target_width / src_width;
 			float yscale = (float)target_height / src_height;
-			float maxxscale = std::max(1.0f, m_int_overscan? render_round_nearest(xscale) : floor(xscale));
-			float maxyscale = std::max(1.0f, m_int_overscan? render_round_nearest(yscale) : floor(yscale));
+			float maxxscale = std::max(double(1.0f), m_int_overscan? render_round_nearest(xscale) : floor(xscale));
+			float maxyscale = std::max(double(1.0f), m_int_overscan? render_round_nearest(yscale) : floor(yscale));
 
 			// now apply desired scale mode and aspect correction
 			if (m_keepaspect && target_aspect > src_aspect) xscale *= src_aspect / target_aspect * (maxyscale / yscale);
diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp
index edb1b9c138a..e62d2013ecb 100644
--- a/src/lib/formats/cassimg.cpp
+++ b/src/lib/formats/cassimg.cpp
@@ -779,7 +779,7 @@ casserr_t cassette_read_modulated_data(cassette_image *cassette, int channel, do
 	}
 	else
 	{
-		buffer_length = std::min(length, U64(100000));
+		buffer_length = std::min(length, UINT64(100000));
 		alloc_buffer = (UINT8*)malloc(buffer_length);
 		if (!alloc_buffer)
 		{