diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index d473fd61..e7279f7c 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -289,13 +289,13 @@ struct Engine::Internal {
 };
 
 
-static void Engine_updateExpander(Engine* that, Module* module, bool side) {
+static void Engine_updateExpander_NoLock(Engine* that, Module* module, bool side) {
 	Module::Expander& expander = side ? module->rightExpander : module->leftExpander;
 	Module* oldExpanderModule = expander.module;
 
 	if (expander.moduleId >= 0) {
 		if (!expander.module || expander.module->id != expander.moduleId) {
-			expander.module = that->getModule(expander.moduleId);
+			expander.module = that->getModule_NoLock(expander.moduleId);
 		}
 	}
 	else {
@@ -592,8 +592,8 @@ void Engine::stepBlock(int frames) {
 
 	// Update expander pointers
 	for (Module* module : internal->modules) {
-		Engine_updateExpander(this, module, false);
-		Engine_updateExpander(this, module, true);
+		Engine_updateExpander_NoLock(this, module, false);
+		Engine_updateExpander_NoLock(this, module, true);
 	}
 
 	// Launch workers
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index 895a6214..a7e1bcb3 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -750,7 +750,7 @@ void init() {
 	// Set up GLFW
 #if defined ARCH_MAC
 	glfwInitHint(GLFW_COCOA_CHDIR_RESOURCES, GLFW_TRUE);
-	glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_TRUE);
+	glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_FALSE);
 #endif
 
 	glfwSetErrorCallback(errorCallback);