diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 60e272395..d2c9ab917 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -79,18 +79,6 @@ EventHandler::EventHandler(OSystem* osystem)
   for(int i = 0; i < kComboSize; ++i)
     for(int j = 0; j < kEventsPerCombo; ++j)
       myComboTable[i][j] = Event::NoType;
-
-  // Erase the Message array
-  for(int i = 0; i < Event::LastType; ++i)
-    ourMessageTable[i] = "";
-
-  // Set unchanging messages
-  ourMessageTable[Event::ConsoleColor]      = "Color Mode";
-  ourMessageTable[Event::ConsoleBlackWhite] = "BW Mode";
-  ourMessageTable[Event::ConsoleLeftDiffA]  = "Left Difficulty A";
-  ourMessageTable[Event::ConsoleLeftDiffB]  = "Left Difficulty B";
-  ourMessageTable[Event::ConsoleRightDiffA] = "Right Difficulty A";
-  ourMessageTable[Event::ConsoleRightDiffB] = "Right Difficulty B";
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1040,6 +1028,26 @@ void EventHandler::handleEvent(Event::Type event, int state)
       return;
     ////////////////////////////////////////////////////////////////////////
 
+    // Events which generate messages
+    case Event::ConsoleColor:
+      if(state) myOSystem->frameBuffer().showMessage("Color Mode");
+      break;
+    case Event::ConsoleBlackWhite:
+      if(state) myOSystem->frameBuffer().showMessage("BW Mode");
+      break;
+    case Event::ConsoleLeftDiffA:
+      if(state) myOSystem->frameBuffer().showMessage("Left Difficulty A");
+      break;
+    case Event::ConsoleLeftDiffB:
+      if(state) myOSystem->frameBuffer().showMessage("Left Difficulty B");
+      break;
+    case Event::ConsoleRightDiffA:
+      if(state) myOSystem->frameBuffer().showMessage("Right Difficulty A");
+      break;
+    case Event::ConsoleRightDiffB:
+      if(state) myOSystem->frameBuffer().showMessage("Right Difficulty B");
+      break;
+
     case Event::NoType:  // Ignore unmapped events
       return;
 
@@ -1047,9 +1055,6 @@ void EventHandler::handleEvent(Event::Type event, int state)
       break;
   }
 
-  if(state && ourMessageTable[event] != "")
-    myOSystem->frameBuffer().showMessage(ourMessageTable[event]);
-
   // Otherwise, pass it to the emulation core
   myEvent.set(event, state);
 }
diff --git a/src/emucore/EventHandler.hxx b/src/emucore/EventHandler.hxx
index 27082efd3..338d5f6c5 100644
--- a/src/emucore/EventHandler.hxx
+++ b/src/emucore/EventHandler.hxx
@@ -385,9 +385,6 @@ class EventHandler
     // The event(s) assigned to each combination event
     Event::Type myComboTable[kComboSize][kEventsPerCombo];
 
-    // Array of messages for each Event
-    string ourMessageTable[Event::LastType];
-
     // Array of strings which correspond to the given StellaKey
     string ourKBDKMapping[KBDK_LAST];
 
diff --git a/src/macosx/stella_intel.xcodeproj/project.pbxproj b/src/macosx/stella_intel.xcodeproj/project.pbxproj
index ba4f5abfc..dd8e6968d 100644
--- a/src/macosx/stella_intel.xcodeproj/project.pbxproj
+++ b/src/macosx/stella_intel.xcodeproj/project.pbxproj
@@ -2032,6 +2032,8 @@
 				);
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				INSTALL_PATH = "@loader_path";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				SDKROOT = "";
 				VALID_ARCHS = "i386 x86_64";
 			};
@@ -2048,6 +2050,8 @@
 				GCC_ENABLE_CPP_RTTI = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				INSTALL_PATH = "@loader_path";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = "";
 				SDKROOT = "";
 				VALID_ARCHS = "i386 x86_64";
@@ -2059,6 +2063,8 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				INSTALL_PATH = "@loader_path";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				SDKROOT = "";
 				VALID_ARCHS = "i386 x86_64";