diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e963165a2..eee822a3f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,6 @@ cmake_minimum_required (VERSION 3.4 FATAL_ERROR)
 project (OpenSpace)
 message(STATUS "Generating OpenSpace project")
 
-set(BOOST_ROOT "G:/deps/bin/boost_1_60_0")
-
 set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")
 set(OPENSPACE_APPS_DIR "${OPENSPACE_BASE_DIR}/apps")
 set(OPENSPACE_EXT_DIR "${OPENSPACE_BASE_DIR}/ext")
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 8fb26fb6f5..fb4b319aa3 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -817,14 +817,13 @@ void OpenSpaceEngine::postDraw() {
     bool showGui = _windowWrapper->hasGuiWindow() ? _windowWrapper->isGuiWindow() : true;
     if (showGui) {
         _renderEngine->renderScreenLog();
-
         if (_console->isVisible())
             _console->render();
 #ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
-        if (_gui->isEnabled())
+        if (_gui->isEnabled() && _isMaster && _windowWrapper->isRegularRendering())
             _gui->endFrame();
-    }
 #endif
+    }
 
     if (_isInShutdownMode)
         _renderEngine->renderShutdownInformation(_shutdownCountdown, _shutdownWait);