diff --git a/src/rendering/r_videoscale.cpp b/src/rendering/r_videoscale.cpp
index 243d42902..a71ee7c3e 100644
--- a/src/rendering/r_videoscale.cpp
+++ b/src/rendering/r_videoscale.cpp
@@ -195,7 +195,7 @@ int ViewportScaledWidth(int width, int height)
 		width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width;
 		height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height;
 	}
-	return (int)MAX((int32_t)min_width, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledWidth(width, height)));
+	return (int)std::max((int32_t)min_width, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledWidth(width, height)));
 }
 
 int ViewportScaledHeight(int width, int height)
@@ -207,7 +207,7 @@ int ViewportScaledHeight(int width, int height)
 		height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height;
 		width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width;
 	}
-	return (int)MAX((int32_t)min_height, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledHeight(width, height)));
+	return (int)std::max((int32_t)min_height, (int32_t)(vid_scalefactor * vScaleTable[vid_scalemode].GetScaledHeight(width, height)));
 }
 
 float ViewportPixelAspect()
diff --git a/src/rendering/v_video.cpp b/src/rendering/v_video.cpp
index 6458c7638..3c75aa73c 100644
--- a/src/rendering/v_video.cpp
+++ b/src/rendering/v_video.cpp
@@ -173,10 +173,10 @@ public:
 		SetVirtualSize(width, height);
 	}
 	// These methods should never be called.
-	void Update() { DBGBREAK; }
-	bool IsFullscreen() { DBGBREAK; return 0; }
-	int GetClientWidth() { DBGBREAK; return 0; }
-	int GetClientHeight() { DBGBREAK; return 0; }
+	void Update() override { DBGBREAK; }
+	bool IsFullscreen() override { DBGBREAK; return 0; }
+	int GetClientWidth() override { DBGBREAK; return 0; }
+	int GetClientHeight() override { DBGBREAK; return 0; }
 	void InitializeState() override {}
 
 	float Gamma;