diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp
index a48fde924..d667cfdb9 100644
--- a/src/qt/qt_main.cpp
+++ b/src/qt/qt_main.cpp
@@ -542,6 +542,17 @@ main(int argc, char *argv[])
 #endif
     QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
 
+    QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
+    fmt.setSwapInterval(0);
+    fmt.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
+    fmt.setRenderableType(QSurfaceFormat::OpenGL);
+#ifdef Q_OS_MACOS
+    fmt.setVersion(4, 1);
+#else
+    fmt.setVersion(3, 2);
+#endif
+    QSurfaceFormat::setDefaultFormat(fmt);
+
     QApplication app(argc, argv);
     QLocale::setDefault(QLocale::C);
     setlocale(LC_NUMERIC, "C");
@@ -573,9 +584,6 @@ main(int argc, char *argv[])
 
     Q_INIT_RESOURCE(qt_resources);
     Q_INIT_RESOURCE(qt_translations);
-    QSurfaceFormat fmt = QSurfaceFormat::defaultFormat();
-    fmt.setSwapInterval(0);
-    QSurfaceFormat::setDefaultFormat(fmt);
 
 #ifdef __APPLE__
     CocoaEventFilter cocoafilter;
diff --git a/src/sound/snd_adlibgold.c b/src/sound/snd_adlibgold.c
index 0181db72e..870e473b0 100644
--- a/src/sound/snd_adlibgold.c
+++ b/src/sound/snd_adlibgold.c
@@ -1063,7 +1063,7 @@ adgold_init(UNUSED(const device_t *info))
     adgold->surround_enabled = device_get_config_int("surround");
     adgold->gameport_enabled = device_get_config_int("gameport");
 
-    fm_driver_get(FM_YMF262, &adgold->opl);
+    fm_driver_get(FM_YMF289B, &adgold->opl);
     if (adgold->surround_enabled)
         ym7128_init(&adgold->ym7128);