diff --git a/BasiliskII/src/MacOSX/sys_darwin.cpp b/BasiliskII/src/MacOSX/sys_darwin.cpp
index 5a798e70..46e6cb5c 100644
--- a/BasiliskII/src/MacOSX/sys_darwin.cpp
+++ b/BasiliskII/src/MacOSX/sys_darwin.cpp
@@ -256,10 +256,10 @@ void DarwinAddFloppyPrefs(void)
 	}
 
 	// Iterate through each floppy
-	while ( nextFloppy = IOIteratorNext(allFloppies))
+	while ( (nextFloppy = IOIteratorNext(allFloppies)))
 	{
 		char		bsdPath[MAXPATHLEN];
-		long		size;
+		long		size = 0;
 		Boolean gotSize = FALSE;
 		CFTypeRef	sizeAsCFNumber =
 						IORegistryEntryCreateCFProperty(nextFloppy,
@@ -333,7 +333,7 @@ void DarwinAddSerialPrefs(void)
 	}
 
 	// Iterate through each modem
-	while ( nextModem = IOIteratorNext(allModems))
+	while ( (nextModem = IOIteratorNext(allModems)))
 	{
 		char		bsdPath[MAXPATHLEN];
 		CFTypeRef	bsdPathAsCFString =
diff --git a/BasiliskII/src/Unix/sysdeps.h b/BasiliskII/src/Unix/sysdeps.h
index 7f8abb05..b6cfea45 100644
--- a/BasiliskII/src/Unix/sysdeps.h
+++ b/BasiliskII/src/Unix/sysdeps.h
@@ -219,7 +219,7 @@ typedef uae_u32 uaecptr;
 
 /* Timing functions */
 extern uint64 GetTicks_usec(void);
-extern void Delay_usec(uint32 usec);
+extern void Delay_usec(uint64 usec);
 
 /* Spinlocks */
 #ifdef __GNUC__
diff --git a/BasiliskII/src/Unix/timer_unix.cpp b/BasiliskII/src/Unix/timer_unix.cpp
index 6a5dd449..f00420e2 100644
--- a/BasiliskII/src/Unix/timer_unix.cpp
+++ b/BasiliskII/src/Unix/timer_unix.cpp
@@ -264,7 +264,7 @@ uint64 GetTicks_usec(void)
 #define USE_COND_TIMEDWAIT
 #endif
 
-void Delay_usec(uint32 usec)
+void Delay_usec(uint64 usec)
 {
 	int was_error;
 
diff --git a/BasiliskII/src/include/version.h b/BasiliskII/src/include/version.h
index 44819c70..79ba3196 100644
--- a/BasiliskII/src/include/version.h
+++ b/BasiliskII/src/include/version.h
@@ -22,8 +22,8 @@
 #define VERSION_H
 
 const int VERSION_MAJOR = 1;
-const int VERSION_MINOR = 0;
+const int VERSION_MINOR = 1;
 
-#define VERSION_STRING "Basilisk II V1.0"
+#define VERSION_STRING "Basilisk II V1.0 SDL2"
 
 #endif
diff --git a/BasiliskII/src/timer.cpp b/BasiliskII/src/timer.cpp
index 1383d8ee..316d8d38 100644
--- a/BasiliskII/src/timer.cpp
+++ b/BasiliskII/src/timer.cpp
@@ -173,7 +173,7 @@ void TimerReset(void)
 int16 InsTime(uint32 tm, uint16 trap)
 {
 	D(bug("InsTime %08lx, trap %04x\n", tm, trap));
-	WriteMacInt16(tm + qType, ReadMacInt16(tm + qType) & 0x1fff | (trap << 4) & 0x6000);
+	WriteMacInt16(tm + qType, (ReadMacInt16(tm + qType) & 0x1fff) | ((trap << 4) & 0x6000));
 	if (find_desc(tm) >= 0)
 		printf("WARNING: InsTime(): Task re-inserted\n");
 	else {