diff --git a/core/hw/aica/aica.cpp b/core/hw/aica/aica.cpp
index a39d5f121..dff033d3f 100644
--- a/core/hw/aica/aica.cpp
+++ b/core/hw/aica/aica.cpp
@@ -68,18 +68,14 @@ void UpdateSh4Ints()
 	u32 p_ints = MCIEB->full & MCIPD->full;
 	if (p_ints)
 	{
-		if ((SB_ISTEXT & SH4_IRQ_BIT )==0)
-		{
+		if ((SB_ISTEXT & SH4_IRQ_BIT) == 0)
 			//if no interrupt is already pending then raise one :)
 			asic_RaiseInterrupt(holly_SPU_IRQ);
-		}
 	}
 	else
 	{
-		if (SB_ISTEXT&SH4_IRQ_BIT)
-		{
+		if ((SB_ISTEXT & SH4_IRQ_BIT) != 0)
 			asic_CancelInterrupt(holly_SPU_IRQ);
-		}
 	}
 
 }
diff --git a/core/hw/aica/aica_mem.cpp b/core/hw/aica/aica_mem.cpp
index 12ae99e29..7964eb6c7 100644
--- a/core/hw/aica/aica_mem.cpp
+++ b/core/hw/aica/aica_mem.cpp
@@ -1,7 +1,7 @@
 #include "aica_mem.h"
 #include "dsp.h"
 #include "sgc_if.h"
-#include "hw/aica/aica_if.h"
+#include "aica_if.h"
 
 u8 aica_reg[0x8000];
 
diff --git a/core/hw/aica/dsp.cpp b/core/hw/aica/dsp.cpp
index 3fff447f6..962068990 100644
--- a/core/hw/aica/dsp.cpp
+++ b/core/hw/aica/dsp.cpp
@@ -16,7 +16,7 @@
 	test game suite.
 
 
-	Initiall code by skmp, now part of the reicast project.
+	Initial code by skmp, now part of the reicast project.
 	See LICENSE & COPYRIGHT files further details
 */
 
diff --git a/core/hw/mem/_vmem.cpp b/core/hw/mem/_vmem.cpp
index 5fd5a271f..7b3a2b4f9 100644
--- a/core/hw/mem/_vmem.cpp
+++ b/core/hw/mem/_vmem.cpp
@@ -373,7 +373,9 @@ void _vmem_reset()
 	verify(_vmem_register_handler(0,0,0,0,0,0)==0);
 }
 
-void _vmem_term() {}
+void _vmem_term()
+{
+}
 
 u8* virt_ram_base;
 bool vmem_4gb_space;
@@ -395,7 +397,8 @@ static void* malloc_pages(size_t size) {
 
 // Resets the FPCB table (by either clearing it to the default val
 // or by flushing it and making it fault on access again.
-void _vmem_bm_reset() {
+void _vmem_bm_reset()
+{
 	// If we allocated it via vmem:
 	if (virt_ram_base)
 		vmem_platform_reset_mem(p_sh4rcb->fpcb, sizeof(p_sh4rcb->fpcb));
@@ -445,7 +448,8 @@ static void _vmem_set_p0_mappings()
 	vmem_platform_create_mappings(&mem_mappings[0], ARRAY_SIZE(mem_mappings));
 }
 
-bool _vmem_reserve() {
+bool _vmem_reserve()
+{
 	// TODO: Static assert?
 	verify((sizeof(Sh4RCB)%PAGE_SIZE)==0);
 
diff --git a/core/rend/gui.cpp b/core/rend/gui.cpp
index d7d5566fa..9fd29a30a 100644
--- a/core/rend/gui.cpp
+++ b/core/rend/gui.cpp
@@ -1214,9 +1214,11 @@ static void gui_display_settings()
 		    	ImGui::Checkbox("Safe Mode", &settings.dynarec.safemode);
 	            ImGui::SameLine();
 	            ShowHelpMarker("Do not optimize integer division. Recommended");
+#if HOST_CPU == CPU_ARM
 		    	ImGui::Checkbox("Unstable Optimizations", &settings.dynarec.unstable_opt);
 	            ImGui::SameLine();
 	            ShowHelpMarker("Enable unsafe optimizations. Will cause crash or environmental disaster");
+#endif
 		    	ImGui::Checkbox("Idle Skip", &settings.dynarec.idleskip);
 	            ImGui::SameLine();
 	            ShowHelpMarker("Skip wait loops. Recommended");