diff --git a/BasiliskII/src/Unix/user_strings_unix.cpp b/BasiliskII/src/Unix/user_strings_unix.cpp
index f095e06c..b04762db 100644
--- a/BasiliskII/src/Unix/user_strings_unix.cpp
+++ b/BasiliskII/src/Unix/user_strings_unix.cpp
@@ -84,8 +84,6 @@ user_string_def platform_strings[] = {
 
 	{STR_IGNORESEGV_CTRL, "Ignore Illegal Memory Accesses"},
 
-	{STR_WINDOW_TITLE_GRABBED, "Basilisk II (mouse grabbed, press Ctrl-F5 to release)"},
-
 	{STR_NO_B2_EXE_FOUND, "Could not start %s (%s)."},
 
 	{-1, NULL}	// End marker
diff --git a/BasiliskII/src/Unix/user_strings_unix.h b/BasiliskII/src/Unix/user_strings_unix.h
index 9bdb9f62..b47f442a 100644
--- a/BasiliskII/src/Unix/user_strings_unix.h
+++ b/BasiliskII/src/Unix/user_strings_unix.h
@@ -75,8 +75,6 @@ enum {
 
 	STR_IGNORESEGV_CTRL,
 
-	STR_WINDOW_TITLE_GRABBED,
-
 	STR_NO_B2_EXE_FOUND
 };
 
diff --git a/BasiliskII/src/Windows/user_strings_windows.cpp b/BasiliskII/src/Windows/user_strings_windows.cpp
index c2241250..0d98d61f 100755
--- a/BasiliskII/src/Windows/user_strings_windows.cpp
+++ b/BasiliskII/src/Windows/user_strings_windows.cpp
@@ -37,7 +37,6 @@ user_string_def platform_strings[] = {
 	{STR_NO_AUDIO_WARN, "No audio device found, audio output will be disabled."},
 	{STR_KEYCODE_FILE_WARN, "Cannot open keycode translation file %s (%s)."},
 	{STR_KEYCODE_VENDOR_WARN, "Cannot find vendor '%s' in keycode translation file %s."},
-	{STR_WINDOW_TITLE_GRABBED, "Basilisk II (mouse grabbed, press Ctrl-F5 to release)"},
 	{STR_NO_WIN32_NT_4, "Basilisk II does not run on Windows NT versions less than 4.0"},
 
 	{STR_PREFS_MENU_FILE_GTK, "/_File"},
diff --git a/BasiliskII/src/Windows/user_strings_windows.h b/BasiliskII/src/Windows/user_strings_windows.h
index ccf5ff54..c8e21e31 100755
--- a/BasiliskII/src/Windows/user_strings_windows.h
+++ b/BasiliskII/src/Windows/user_strings_windows.h
@@ -39,7 +39,6 @@ enum {
 	STR_NO_AUDIO_WARN,
 	STR_KEYCODE_FILE_WARN,
 	STR_KEYCODE_VENDOR_WARN,
-	STR_WINDOW_TITLE_GRABBED,
 	STR_NO_WIN32_NT_4,
 
 	STR_PREFS_MENU_FILE_GTK,
diff --git a/BasiliskII/src/extfs.cpp b/BasiliskII/src/extfs.cpp
index 99470e8f..e18d1df1 100644
--- a/BasiliskII/src/extfs.cpp
+++ b/BasiliskII/src/extfs.cpp
@@ -175,9 +175,9 @@ static uint32 next_cnid = fsUsrCNID;	// Next available CNID
 
 #if defined __APPLE__ && defined __MACH__
 struct crtimebuf {
-	unsigned long length;
-	struct timespec crtime;
-};
+    u_int32_t length;
+    struct timespec crtime;
+} __attribute__((aligned(4), packed));
 
 static uint32 do_get_creation_time(const char *path)
 {
diff --git a/BasiliskII/src/include/user_strings.h b/BasiliskII/src/include/user_strings.h
index 7f2958f4..24a0b28a 100644
--- a/BasiliskII/src/include/user_strings.h
+++ b/BasiliskII/src/include/user_strings.h
@@ -213,6 +213,7 @@ enum {
 	// Mac window
 	STR_WINDOW_TITLE = 4000,
 	STR_WINDOW_TITLE_FROZEN,
+	STR_WINDOW_TITLE_GRABBED,
 	STR_WINDOW_MENU = 4050,
 	STR_WINDOW_ITEM_ABOUT,
 	STR_WINDOW_ITEM_REFRESH,
diff --git a/BasiliskII/src/user_strings.cpp b/BasiliskII/src/user_strings.cpp
index f4861825..55a7fb87 100644
--- a/BasiliskII/src/user_strings.cpp
+++ b/BasiliskII/src/user_strings.cpp
@@ -226,6 +226,7 @@ user_string_def common_strings[] = {
 
 	{STR_WINDOW_TITLE, "Basilisk II"},
 	{STR_WINDOW_TITLE_FROZEN, "Basilisk II *** FROZEN ***"},
+	{STR_WINDOW_TITLE_GRABBED, "Basilisk II (mouse grabbed, press Ctrl-F5 to release)"},
 	{STR_WINDOW_MENU, "Basilisk II"},
 	{STR_WINDOW_ITEM_ABOUT, "About Basilisk II" ELLIPSIS},
 	{STR_WINDOW_ITEM_REFRESH, "Refresh Rate"},
diff --git a/SheepShaver/src/Unix/user_strings_unix.cpp b/SheepShaver/src/Unix/user_strings_unix.cpp
index 5a3b21f5..4aafced5 100644
--- a/SheepShaver/src/Unix/user_strings_unix.cpp
+++ b/SheepShaver/src/Unix/user_strings_unix.cpp
@@ -84,7 +84,6 @@ user_string_def platform_strings[] = {
 	{STR_VOSF_INIT_ERR, "Cannot initialize Video on SEGV signals."},
 
 	{STR_OPEN_WINDOW_ERR, "Cannot open Mac window."},
-	{STR_WINDOW_TITLE_GRABBED, "SheepShaver (mouse grabbed, press Ctrl-F5 to release)"},
 
 	{STR_NO_B2_EXE_FOUND, "Could not start %s (%s)."},
 
diff --git a/SheepShaver/src/Unix/user_strings_unix.h b/SheepShaver/src/Unix/user_strings_unix.h
index be9ea0bb..8858684c 100644
--- a/SheepShaver/src/Unix/user_strings_unix.h
+++ b/SheepShaver/src/Unix/user_strings_unix.h
@@ -18,8 +18,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef USER_STRINGS_LINUX_H
-#define USER_STRINGS_LINUX_H
+#ifndef USER_STRINGS_UNIX_H
+#define USER_STRINGS_UNIX_H
 
 enum {
 	STR_NO_DEV_ZERO_ERR = 10000,
@@ -78,7 +78,6 @@ enum {
 	STR_MOUSEWHEELLINES_CTRL,
 
 	STR_OPEN_WINDOW_ERR,
-	STR_WINDOW_TITLE_GRABBED,
 
 	STR_NO_B2_EXE_FOUND
 };
diff --git a/SheepShaver/src/Windows/user_strings_windows.cpp b/SheepShaver/src/Windows/user_strings_windows.cpp
index 92555c8f..32e52d25 100755
--- a/SheepShaver/src/Windows/user_strings_windows.cpp
+++ b/SheepShaver/src/Windows/user_strings_windows.cpp
@@ -45,7 +45,6 @@ user_string_def platform_strings[] = {
 	{STR_VOSF_INIT_ERR, "Cannot initialize Video on SEGV signals."},
 
 	{STR_OPEN_WINDOW_ERR, "Cannot open Mac window."},
-	{STR_WINDOW_TITLE_GRABBED, "SheepShaver (mouse grabbed, press Ctrl-F5 to release)"},
 	{STR_NO_WIN32_NT_4, "SheepShaver does not run on Windows NT versions less than 4.0"},
 
 	{STR_PREFS_MENU_FILE_GTK, "/_File"},
diff --git a/SheepShaver/src/Windows/user_strings_windows.h b/SheepShaver/src/Windows/user_strings_windows.h
index 7980c5f7..7db10a74 100755
--- a/SheepShaver/src/Windows/user_strings_windows.h
+++ b/SheepShaver/src/Windows/user_strings_windows.h
@@ -39,7 +39,6 @@ enum {
 	STR_KEYCODE_FILE_WARN,
 	STR_KEYCODE_VENDOR_WARN,
 	STR_OPEN_WINDOW_ERR,
-	STR_WINDOW_TITLE_GRABBED,
 	STR_NO_WIN32_NT_4,
 
 	STR_PREFS_MENU_FILE_GTK,
diff --git a/SheepShaver/src/include/user_strings.h b/SheepShaver/src/include/user_strings.h
index 12ea12eb..c0fbb6dc 100644
--- a/SheepShaver/src/include/user_strings.h
+++ b/SheepShaver/src/include/user_strings.h
@@ -166,6 +166,7 @@ enum {
 	// Mac window
 	STR_WINDOW_TITLE = 4000,
 	STR_WINDOW_TITLE_FROZEN,
+	STR_WINDOW_TITLE_GRABBED,
 	STR_WINDOW_MENU = 4050,
 	STR_WINDOW_ITEM_ABOUT,
 	STR_WINDOW_ITEM_REFRESH,
diff --git a/SheepShaver/src/user_strings.cpp b/SheepShaver/src/user_strings.cpp
index 4041d451..f4618b55 100644
--- a/SheepShaver/src/user_strings.cpp
+++ b/SheepShaver/src/user_strings.cpp
@@ -172,6 +172,7 @@ user_string_def common_strings[] = {
 
 	{STR_WINDOW_TITLE, "SheepShaver"},
 	{STR_WINDOW_TITLE_FROZEN, "SheepShaver *** FROZEN ***"},
+	{STR_WINDOW_TITLE_GRABBED, "SheepShaver (mouse grabbed, press Ctrl-F5 to release)"},
 	{STR_WINDOW_MENU, "SheepShaver"},
 	{STR_WINDOW_ITEM_ABOUT, "About SheepShaver" ELLIPSIS},
 	{STR_WINDOW_ITEM_REFRESH, "Refresh Rate"},