diff --git a/Documentation/DeveloperHelpSources/changelog.docu b/Documentation/DeveloperHelpSources/changelog.docu
index ee4a05ce4accfa2f760a682903dab49a249a1238..17ce3d3283d140f31af790a4d3169f15a78dde69 100644
--- a/Documentation/DeveloperHelpSources/changelog.docu
+++ b/Documentation/DeveloperHelpSources/changelog.docu
@@ -9,6 +9,8 @@
          - Queued cross plugin interconnection feature
          - Use QOpenGLWidget
          - Switched to Qt command line parsing and removed SimpleOpt
+         - Fix clang warning by avoiding GNU extension
+         - Do not automatically save file immediately after loading with ctrl-o
      - <b>ACG</b>
          - Clamp shininess in Materialnode (caused GL Errors)
          - Better Material support in Materialnode (emissive and refractive materials)
diff --git a/libs_required/ACG/GL/globjects.hh b/libs_required/ACG/GL/globjects.hh
index ccc8f1eec1733424c0d03e0c6971d01351d12d9d..f387cfa4f411559e1f5df4c20d3c3ec17eec05c6 100644
--- a/libs_required/ACG/GL/globjects.hh
+++ b/libs_required/ACG/GL/globjects.hh
@@ -151,7 +151,7 @@ public:
 
   char* offset(unsigned int _offset) const
   {
-    return ((char*)NULL + _offset);
+    return reinterpret_cast<char*>(_offset);
   }
 
   GLuint id() const {return vbo;}
diff --git a/widgets/coreWidget/CoreWidget.cc b/widgets/coreWidget/CoreWidget.cc
index 40d5d364395c4f8061e050260b06fdc9127d00fa..ae4b8eeb98a022ff0fceabc46a2a7a5b37ca63d2 100644
--- a/widgets/coreWidget/CoreWidget.cc
+++ b/widgets/coreWidget/CoreWidget.cc
@@ -950,7 +950,11 @@ CoreWidget::updateRecent()
     }
 
   }
-
+  // Workaround for QMenu issue on MacOS: https://bugreports.qt.io/browse/QTBUG-63848
+  // Without this, the recent files menu entries are all disabled after using the menu once:
+  // https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/issues/139
+  recentFilesMenu_->setEnabled(false);
+  recentFilesMenu_->setEnabled(true);
 }
 
 void
diff --git a/widgets/coreWidget/keyHandling.cc b/widgets/coreWidget/keyHandling.cc
index 096c87ef253080419ee26936be498978452bc4e9..59384e7ba1f1c6aa3ed5b9a8cd16f2978bcf4d62 100644
--- a/widgets/coreWidget/keyHandling.cc
+++ b/widgets/coreWidget/keyHandling.cc
@@ -605,6 +605,7 @@ void CoreWidget::coreKeyPressEvent  (QKeyEvent* _e){
 
       case Qt::Key_O :
         loadMenu();
+        return;
 
       case Qt::Key_S :
         saveMenu();