diff --git a/src/audio/mockingboard.c b/src/audio/mockingboard.c
index 08aaa194..dcb5ee74 100644
--- a/src/audio/mockingboard.c
+++ b/src/audio/mockingboard.c
@@ -238,12 +238,12 @@ static VOICE SSI263Voice[MAX_VOICES];
 static VOICE SSI263Voice[MAX_VOICES] = {0};
 #endif
 
-static const int g_nNumEvents = 2;
 #ifdef APPLE2IX
 static pthread_cond_t mockingboard_cond = PTHREAD_COND_INITIALIZER;
 static pthread_mutex_t mockingboard_mutex = PTHREAD_MUTEX_INITIALIZER;
 static uint8_t quit_event = false;
 #else
+static const int g_nNumEvents = 2;
 static HANDLE g_hSSI263Event[g_nNumEvents] = {NULL};	// 1: Phoneme finished playing, 2: Exit thread
 static DWORD g_dwMaxPhonemeLen = 0;
 #endif
diff --git a/src/display.c b/src/display.c
index 88397ae7..599a56cb 100644
--- a/src/display.c
+++ b/src/display.c
@@ -27,7 +27,7 @@
 static uint8_t vga_mem_page_0[SCANWIDTH*SCANHEIGHT];
 static uint8_t vga_mem_page_1[SCANWIDTH*SCANHEIGHT];
 
-A2Color colormap[256] = { 0 };
+A2Color colormap[256] = { { 0 } };
 
 uint8_t video__wider_font[0x8000];
 uint8_t video__font[0x4000];
diff --git a/src/interface.c b/src/interface.c
index 3d35a1f8..35db7dee 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -1613,6 +1613,6 @@ static void *interface_thread(void *current_key)
 void c_interface_begin(int current_key)
 {
     pthread_t t = 0;
-    pthread_create(&t, NULL, (void *) &interface_thread, (void *)current_key);
+    pthread_create(&t, NULL, (void *)&interface_thread, (void *)((__SWORD_TYPE)current_key));
 }
 
diff --git a/src/timing.c b/src/timing.c
index 34327281..0113fcdc 100644
--- a/src/timing.c
+++ b/src/timing.c
@@ -339,7 +339,7 @@ void CpuCalcCycles(const unsigned long nExecutedCycles)
     g_nCumulativeCycles += nCycles;
     // HACK FIXME TODO
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "--Wshorten-64-to-32"
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
     g_nCyclesExecuted = nExecutedCycles;
 #pragma clang diagnostic pop
 }
diff --git a/src/video/glvideo.c b/src/video/glvideo.c
index b0c232da..56f5a2e1 100644
--- a/src/video/glvideo.c
+++ b/src/video/glvideo.c
@@ -16,6 +16,7 @@
 #include "video/renderer.h"
 
 #include "video_util/modelUtil.h"
+#include "video_util/matrixUtil.h"
 #include "video_util/sourceUtil.h"
 
 #ifdef __APPLE__
@@ -726,7 +727,7 @@ void video_driver_init(void *fbo) {
 #if defined(__APPLE__)
     gldriver_init_common();
 #elif USE_GLUT
-    gldriver_init_glut(fbo);
+    gldriver_init_glut(defaultFBO);
 #else
 #error no working codepaths
 #endif
diff --git a/src/video_util/modelUtil.c b/src/video_util/modelUtil.c
index dc45f872..ba849a37 100644
--- a/src/video_util/modelUtil.c
+++ b/src/video_util/modelUtil.c
@@ -56,7 +56,7 @@ demoModel *mdlLoadModel(const char *filepathname) {
         return NULL;
     }
 
-    modelHeader header = { 0 };
+    modelHeader header = { { 0 } };
     sizeRead = fread(&header, 1, sizeof(modelHeader), curFile);
     if (sizeRead != sizeof(modelHeader)) {
         fclose(curFile);