diff --git a/src/Main/FatalErrorHandler.cpp b/src/Main/FatalErrorHandler.cpp
index 724b6dcc..bd343578 100644
--- a/src/Main/FatalErrorHandler.cpp
+++ b/src/Main/FatalErrorHandler.cpp
@@ -20,11 +20,7 @@
 #endif
 
 #ifdef TC_MACOSX
-#	ifdef __ppc__
-#		include <ppc/ucontext.h>
-#	else
-#		include <i386/ucontext.h>
-#	endif
+#	include <sys/ucontext.h>
 #elif defined (TC_BSD)
 #	include <ucontext.h>
 #endif
@@ -54,12 +50,10 @@ namespace VeraCrypt
 #	endif
 
 #elif defined (TC_MACOSX)
-#	ifdef __ppc__
-		faultingInstructionAddress = context->uc_mcontext->ss.srr0;
-#	elif defined (__x86_64__)
-		faultingInstructionAddress = context->uc_mcontext->ss.rip;
+#	ifdef __x86_64__
+		faultingInstructionAddress = context->uc_mcontext->__ss.__rip;
 #	else
-		faultingInstructionAddress = context->uc_mcontext->ss.eip;
+		faultingInstructionAddress = context->uc_mcontext->__ss.__eip;
 #	endif
 
 #endif
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp
index 7c329292..b48f3718 100644
--- a/src/Main/Forms/MainFrame.cpp
+++ b/src/Main/Forms/MainFrame.cpp
@@ -1020,7 +1020,7 @@ namespace VeraCrypt
 		if (!ListItemRightClickEventPending)
 		{
 			ListItemRightClickEventPending = true;
-			SlotListCtrl->AddPendingEvent (event);
+			SlotListCtrl->GetEventHandler()->AddPendingEvent (event);
 			return;
 		}