diff --git a/Core/MIPS/ARM/ArmCompVFPU.cpp b/Core/MIPS/ARM/ArmCompVFPU.cpp
index f6e9eecd04..786712be54 100644
--- a/Core/MIPS/ARM/ArmCompVFPU.cpp
+++ b/Core/MIPS/ARM/ArmCompVFPU.cpp
@@ -1097,12 +1097,10 @@ namespace MIPSComp
 	}
 
 	void Jit::Comp_Vfim(u32 op) {
-		DISABLE;
-		/*
-		VectorSize sz = GetVecSize(op);
-		if (sz != V_Single)	{
-			ERROR_LOG(JIT, "vfim: wrong vector size");
-		}
+		CONDITIONAL_DISABLE;
+
+		if (js.MayHavePrefix())
+			DISABLE;
 
 		u8 dreg;
 		GetVectorRegs(&dreg, V_Single, _VT);
@@ -1110,12 +1108,12 @@ namespace MIPSComp
 		FP16 half;
 		half.u = op & 0xFFFF;
 		FP32 fval = half_to_float_fast5(half);
-		MOV(32, R(EAX), Imm32(fval.u));
+		MOVI2F(S0, fval.f, R0);
 		fpr.MapRegV(dreg, MAP_DIRTY | MAP_NOINIT);
-		MOVD_xmm(fpr.VX(dreg), R(EAX));
+		VMOV(fpr.V(dreg), S0);
 
 		ApplyPrefixD(&dreg, V_Single);
-		fpr.ReleaseSpillLocks();*/
+		fpr.ReleaseSpillLocks();
 	}
 
 	void Jit::Comp_Vcst(u32 op) {
diff --git a/Core/MIPS/x86/CompVFPU.cpp b/Core/MIPS/x86/CompVFPU.cpp
index 1e8653bcd8..08b00cee19 100644
--- a/Core/MIPS/x86/CompVFPU.cpp
+++ b/Core/MIPS/x86/CompVFPU.cpp
@@ -1208,11 +1208,6 @@ void Jit::Comp_Viim(u32 op) {
 void Jit::Comp_Vfim(u32 op) {
 	CONDITIONAL_DISABLE;
 
-	VectorSize sz = GetVecSize(op);
-	if (sz != V_Single)	{
-		ERROR_LOG(JIT, "vfim: wrong vector size");
-	}
-
 	u8 dreg;
 	GetVectorRegs(&dreg, V_Single, _VT);
 
diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp
index 8535446e7e..f1e729382a 100644
--- a/UI/MenuScreens.cpp
+++ b/UI/MenuScreens.cpp
@@ -803,14 +803,18 @@ void DeveloperScreen::render() {
 		i18nrepo.SaveIni(g_Config.languageIni);
 	}
 
-	if (UIButton(GEN_ID, vlinear, LARGE_BUTTON_WIDTH + 80, 0, d->T("Run CPU Tests"), ALIGN_LEFT)) {
-		// TODO: Run tests
-		RunTests();
-		// screenManager()->push(new EmuScreen())
+	if (!gpu) {
+		if (UIButton(GEN_ID, vlinear, LARGE_BUTTON_WIDTH + 80, 0, d->T("Run CPU Tests"), ALIGN_LEFT)) {
+			// TODO: Run tests
+			RunTests();
+			// screenManager()->push(new EmuScreen())
+		}
 	}
 
-	if (UIButton(GEN_ID, vlinear, LARGE_BUTTON_WIDTH + 80, 0, d->T("Dump next frame"), ALIGN_LEFT)) {
-		gpu->DumpNextFrame();
+	if (gpu) {
+		if (UIButton(GEN_ID, vlinear, LARGE_BUTTON_WIDTH + 80, 0, d->T("Dump next frame"), ALIGN_LEFT)) {
+			gpu->DumpNextFrame();
+		}
 	}
 	
 	UIEnd();