diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index ae1fad40..83dbd548 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -945,6 +945,10 @@ void MainWindow::changeEvent(QEvent* event)
             windowStateChanged();
             break;
         }
+        default:
+        {
+            break;
+        }
         }
     }
     // all that do not return are allowing the event to propagate
diff --git a/src/gui/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h
index a263a8d5..a6605117 100644
--- a/src/gui/src/ScreenSetupView.h
+++ b/src/gui/src/ScreenSetupView.h
@@ -43,14 +43,14 @@ class ScreenSetupView : public QTableView
         ScreenSetupModel* model() const;
 
     protected:
-        void mouseDoubleClickEvent(QMouseEvent*);
+        void mouseDoubleClickEvent(QMouseEvent*) override;
         void setTableSize();
-        void resizeEvent(QResizeEvent*);
-        void dragEnterEvent(QDragEnterEvent* event);
-        void dragMoveEvent(QDragMoveEvent* event);
-        void startDrag(Qt::DropActions supportedActions);
-        QStyleOptionViewItem viewOptions() const;
-        void scrollTo(const QModelIndex&, ScrollHint) {}
+        void resizeEvent(QResizeEvent*) override;
+        void dragEnterEvent(QDragEnterEvent* event) override;
+        void dragMoveEvent(QDragMoveEvent* event) override;
+        void startDrag(Qt::DropActions supportedActions) override;
+        QStyleOptionViewItem viewOptions() const override;
+        void scrollTo(const QModelIndex&, ScrollHint) override {}
 };
 
 #endif
diff --git a/src/lib/platform/OSXDragSimulator.m b/src/lib/platform/OSXDragSimulator.m
index affed383..5112ad91 100644
--- a/src/lib/platform/OSXDragSimulator.m
+++ b/src/lib/platform/OSXDragSimulator.m
@@ -35,7 +35,7 @@ runCocoaApp()
 	
     NSWindow* window = [[NSWindow alloc]
 						initWithContentRect: NSMakeRect(0, 0, 3, 3)
-						styleMask: NSBorderlessWindowMask
+						styleMask: NSWindowStyleMaskBorderless
 						backing: NSBackingStoreBuffered
 						defer: NO];
     [window setTitle: @""];
diff --git a/src/lib/platform/OSXMediaKeySimulator.m b/src/lib/platform/OSXMediaKeySimulator.m
index 5aacd107..08d43ef8 100644
--- a/src/lib/platform/OSXMediaKeySimulator.m
+++ b/src/lib/platform/OSXMediaKeySimulator.m
@@ -71,14 +71,14 @@ bool
 fakeNativeMediaKey(KeyID id)
 {
 	
-	NSEvent* downRef = [NSEvent otherEventWithType:NSSystemDefined
+	NSEvent* downRef = [NSEvent otherEventWithType:NSEventTypeSystemDefined
 					location: NSMakePoint(0, 0) modifierFlags:0xa00
 					timestamp:0 windowNumber:0 context:0 subtype:8
 					data1:(convertKeyIDToNXKeyType(id) << 16) | ((0xa) << 8)
 					data2:-1];
 	CGEventRef downEvent = [downRef CGEvent];
 	
-	NSEvent* upRef = [NSEvent otherEventWithType:NSSystemDefined
+	NSEvent* upRef = [NSEvent otherEventWithType:NSEventTypeSystemDefined
 					location: NSMakePoint(0, 0) modifierFlags:0xa00
 					timestamp:0 windowNumber:0 context:0 subtype:8
 					data1:(convertKeyIDToNXKeyType(id) << 16) | ((0xb) << 8)
diff --git a/src/lib/platform/OSXMediaKeySupport.m b/src/lib/platform/OSXMediaKeySupport.m
index 9c9dbc31..e73a0914 100644
--- a/src/lib/platform/OSXMediaKeySupport.m
+++ b/src/lib/platform/OSXMediaKeySupport.m
@@ -133,14 +133,14 @@ bool
 fakeNativeMediaKey(KeyID id)
 {
 	
-	NSEvent* downRef = [NSEvent otherEventWithType:NSSystemDefined
+	NSEvent* downRef = [NSEvent otherEventWithType:NSEventTypeSystemDefined
 					location: NSMakePoint(0, 0) modifierFlags:0xa00
 					timestamp:0 windowNumber:0 context:0 subtype:8
 					data1:(convertKeyIDToNXKeyType(id) << 16) | ((0xa) << 8)
 					data2:-1];
 	CGEventRef downEvent = [downRef CGEvent];
 	
-	NSEvent* upRef = [NSEvent otherEventWithType:NSSystemDefined
+	NSEvent* upRef = [NSEvent otherEventWithType:NSEventTypeSystemDefined
 					location: NSMakePoint(0, 0) modifierFlags:0xa00
 					timestamp:0 windowNumber:0 context:0 subtype:8
 					data1:(convertKeyIDToNXKeyType(id) << 16) | ((0xb) << 8)
diff --git a/src/lib/platform/OSXPasteboardPeeker.m b/src/lib/platform/OSXPasteboardPeeker.m
index ab39e262..cf61046e 100644
--- a/src/lib/platform/OSXPasteboardPeeker.m
+++ b/src/lib/platform/OSXPasteboardPeeker.m
@@ -21,7 +21,7 @@
 CFStringRef
 getDraggedFileURL()
 {
-	NSString* pbName = NSDragPboard;
+	NSString* pbName = NSPasteboardNameDrag;
 	NSPasteboard* pboard = [NSPasteboard pasteboardWithName:pbName];
 	
 	NSMutableString* string;