diff --git a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
index fcb78887d7..4999e42dfc 100644
--- a/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellVideoOut.cpp
@@ -71,7 +71,9 @@ error_code cellVideoOutGetState(u32 videoOut, u32 deviceIndex, vm::ptr<CellVideo
 		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	if (deviceIndex >= cellVideoOutGetNumberOfDevice(videoOut))
+	const auto device_count = cellVideoOutGetNumberOfDevice(videoOut);
+
+	if (device_count < 0 || deviceIndex >= static_cast<u32>(device_count))
 	{
 		return CELL_VIDEO_OUT_ERROR_DEVICE_NOT_FOUND;
 	}
@@ -227,7 +229,9 @@ error_code cellVideoOutGetDeviceInfo(u32 videoOut, u32 deviceIndex, vm::ptr<Cell
 		return CELL_VIDEO_OUT_ERROR_ILLEGAL_PARAMETER;
 	}
 
-	if (deviceIndex >= cellVideoOutGetNumberOfDevice(videoOut))
+	const auto device_count = cellVideoOutGetNumberOfDevice(videoOut);
+
+	if (device_count < 0 || deviceIndex >= static_cast<u32>(device_count))
 	{
 		return CELL_VIDEO_OUT_ERROR_DEVICE_NOT_FOUND;
 	}
diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h
index ed53e751a6..2b1c9d621d 100644
--- a/rpcs3/Emu/RSX/RSXThread.h
+++ b/rpcs3/Emu/RSX/RSXThread.h
@@ -760,7 +760,7 @@ namespace rsx
 		virtual void notify_tile_unbound(u32 /*tile*/) {}
 
 		// control
-		virtual void renderctl(u32 request_code, void* args) {}
+		virtual void renderctl(u32 /*request_code*/, void* /*args*/) {}
 
 		// zcull
 		void notify_zcull_info_changed();