diff --git a/core/linux/common.cpp b/core/linux/common.cpp
index c9b4e0292..e41e4a670 100644
--- a/core/linux/common.cpp
+++ b/core/linux/common.cpp
@@ -292,7 +292,7 @@ void enable_runfast()
 }
 
 void linux_fix_personality() {
-        #if !defined(TARGET_BSD) && !defined(_ANDROID) && !defined(TARGET_OS_IPHONE) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN)
+        #if !defined(TARGET_BSD) && !defined(_ANDROID) && !defined(TARGET_NACL32) && !defined(TARGET_EMSCRIPTEN) && HOST_OS != OS_DARWIN
           printf("Personality: %08X\n", personality(0xFFFFFFFF));
           personality(~READ_IMPLIES_EXEC & personality(0xFFFFFFFF));
           printf("Updated personality: %08X\n", personality(0xFFFFFFFF));
diff --git a/core/linux/context.cpp b/core/linux/context.cpp
index 290dcb2d8..34c23a848 100644
--- a/core/linux/context.cpp
+++ b/core/linux/context.cpp
@@ -77,8 +77,10 @@ void context_segfault(rei_host_context_t* reictx, void* segfault_ctx, bool to_se
 		bicopy(reictx->pc, MCTX(.__gregs[_REG_RIP]), to_segfault);
 	#elif HOST_OS == OS_LINUX
 		bicopy(reictx->pc, MCTX(.gregs[REG_RIP]), to_segfault);
-	#else
-		#error HOST_OS
+    #elif HOST_OS == OS_DARWIN
+        bicopy(reictx->pc, MCTX(->__ss.__rip), to_segfault);
+    #else
+	    #error HOST_OS
 	#endif
 #elif HOST_CPU == CPU_MIPS
 	bicopy(reictx->pc, MCTX(.pc), to_segfault);
diff --git a/shell/apple/emulator-osx/emulator-osx/EmuGLView.swift b/shell/apple/emulator-osx/emulator-osx/EmuGLView.swift
index 9805e8dbf..e082fd067 100644
--- a/shell/apple/emulator-osx/emulator-osx/EmuGLView.swift
+++ b/shell/apple/emulator-osx/emulator-osx/EmuGLView.swift
@@ -81,11 +81,6 @@ class EmuGLView: NSOpenGLView, NSWindowDelegate {
         self.window!.delegate = self
     }
     
-    override func viewDidMoveToWindow() {
-        super.viewDidMoveToWindow()
-        self.window!.delegate = self
-    }
-    
     func windowWillClose(_ notification: Notification) {
         emu_dc_stop()
     }