diff --git a/rpcs3/Emu/Cell/SPURecompiler.h b/rpcs3/Emu/Cell/SPURecompiler.h
index 0851c70a3e..6bdcddf1cb 100644
--- a/rpcs3/Emu/Cell/SPURecompiler.h
+++ b/rpcs3/Emu/Cell/SPURecompiler.h
@@ -3840,7 +3840,7 @@ private:
 
 	void UNK(u32 code, u32 opcode, u32 gcode)
 	{
-		UNK(fmt::Format("(SPURecompiler) Unimplemented opcode! (0x%08x, 0x%x, 0x%x)", code, opcode, gcode));
+		UNK(fmt::Format("Unimplemented opcode! (0x%08x, 0x%x, 0x%x)", code, opcode, gcode));
 	}
 
 	void UNK(const std::string& err)
diff --git a/rpcs3/Emu/Cell/SPURecompilerCore.cpp b/rpcs3/Emu/Cell/SPURecompilerCore.cpp
index 52563b2e0d..fe005b6804 100644
--- a/rpcs3/Emu/Cell/SPURecompilerCore.cpp
+++ b/rpcs3/Emu/Cell/SPURecompilerCore.cpp
@@ -23,7 +23,7 @@ SPURecompilerCore::SPURecompilerCore(SPUThread& cpu)
 	X86CpuUtil::detect(&inf);
 	if (!inf.hasFeature(kX86CpuFeatureSse41))
 	{
-		LOG_ERROR(SPU, "SPU Recompiler requires SSE4.1 instruction set support");
+		LOG_ERROR(SPU, "SPU JIT requires SSE4.1 instruction set support");
 		Emu.Pause();
 	}
 }
@@ -169,13 +169,6 @@ u8 SPURecompilerCore::DecodeMemory(const u64 address)
 	//ConLog.Write("DecodeMemory: pos=%d", pos);
 	u32* ls = (u32*)&Memory[m_offset];
 
-	if (!pos)
-	{
-		LOG_ERROR(Log::SPU, "SPURecompilerCore::DecodeMemory(): ls_addr = 0");
-		Emu.Pause();
-		return 0;
-	}
-
 	if (entry[pos].pointer)
 	{
 		// check data (hard way)
diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp
index 8fe3b05371..705aa26494 100644
--- a/rpcs3/Gui/MainFrame.cpp
+++ b/rpcs3/Gui/MainFrame.cpp
@@ -429,12 +429,11 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
 	wxCheckBox* chbox_hle_exitonstop      = new wxCheckBox(p_hle, wxID_ANY, "Exit RPCS3 when process finishes");
 	wxCheckBox* chbox_hle_always_start    = new wxCheckBox(p_hle, wxID_ANY, "Always start after boot");
 
-	//cbox_cpu_decoder->Append("DisAsm");
-	cbox_cpu_decoder->Append("Interpreter & DisAsm");
-	cbox_cpu_decoder->Append("Interpreter");
+	cbox_cpu_decoder->Append("PPU Interpreter & DisAsm");
+	cbox_cpu_decoder->Append("PPU Interpreter");
 
-	cbox_spu_decoder->Append("Interpreter");
-	cbox_spu_decoder->Append("Recompiler");
+	cbox_spu_decoder->Append("SPU Interpreter");
+	cbox_spu_decoder->Append("SPU JIT (asmjit)");
 
 	for(int i=1; i<WXSIZEOF(ResolutionTable); ++i)
 	{