diff --git a/.gitignore b/.gitignore
index d52c73c..6054d53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ gsport
 
 *.gsp
 
-# Storage for many disk images for testing the emulator.  
+# Storage for many disk images for testing the emulator.
 # Games, demos, apps, etc.  Not part of the project.
 images/
 
@@ -25,4 +25,5 @@ images/
 screens/
 
 # build tools that are often kept/tested locally as well as on the ci machines
+build/
 yoursway-create-dmg/
diff --git a/src/scc_socket_driver.c b/src/scc_socket_driver.c
index db92142..a7d47b7 100644
--- a/src/scc_socket_driver.c
+++ b/src/scc_socket_driver.c
@@ -332,7 +332,9 @@ void scc_socket_close(int port, int full_close, double dcycs) {
     return;
   }
 
-  scc_socket_modem_hangup(port, dcycs);
+  if(g_serial_modem[port]) {
+    scc_socket_modem_hangup(port, dcycs);
+  }
 
   /* and go back to modem mode */
   scc_ptr->socket_state = 0;
diff --git a/src/sdl2_driver.c b/src/sdl2_driver.c
index e56f6f0..4ef43c4 100644
--- a/src/sdl2_driver.c
+++ b/src/sdl2_driver.c
@@ -183,15 +183,15 @@ int a2_key_to_sdlkeycode[][3] = {
   { kVK_Control,            SDLK_LCTRL,     0 },
   { kVK_RightControl,       SDLK_RCTRL,     0 },
   #if defined(__APPLE__)
-  { kVK_Option,             SDLK_LALT,      0 },         /* Option */
-  { kVK_RightOption,        SDLK_RALT,      0 },         /* Option */
-  { kVK_Command,            SDLK_LGUI,      0 },         /* Command */
-  { kVK_RightCommand,       SDLK_RGUI,      0 },         /* Command */
+  { kVK_Option,             SDLK_LALT,      0 },         /* Command */
+  { kVK_RightOption,        SDLK_RALT,      0 },         /* Command */
+  { kVK_Command,            SDLK_LGUI,      0 },         /* Option */
+  { kVK_RightCommand,       SDLK_RGUI,      0 },         /* Option */
   #else
-  { kVK_Option,             SDLK_LGUI,      0 },         /* Command */
-  { kVK_RightOption,        SDLK_RGUI,      0 },         /* Command */
-  { kVK_Command,            SDLK_LALT,      0 },         /* Option */
-  { kVK_RightCommand,       SDLK_RALT,      0 },         /* Option */
+  { kVK_Option,             SDLK_LGUI,      0 },         /* Option */
+  { kVK_RightOption,        SDLK_RGUI,      0 },         /* Option */
+  { kVK_Command,            SDLK_LALT,      0 },         /* Command */
+  { kVK_RightCommand,       SDLK_RALT,      0 },         /* Command */
   #endif
   { kVK_Space,              SDLK_SPACE,     0 },
   { kVK_LeftArrow,          SDLK_LEFT,      0 },
@@ -654,7 +654,7 @@ void handle_sdl_mouse_event(SDL_Event event) {
     x = event.motion.x - BASE_MARGIN_LEFT;
     y = event.motion.y - BASE_MARGIN_TOP;
   }
-  
+
   switch (event.type) {
     case SDL_MOUSEMOTION:
       update_mouse_w_delta(x, y, 0, 0, event.motion.xrel, event.motion.yrel);