diff --git a/Jenkinsfile b/Jenkinsfile
index 1985a6a989..6bec006822 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,7 @@ stage('Build') {
                     cd build
                     cmake .. ''' +
                     flags + ''' ..
-                make
+                make -j2
                 '''
             }
         }
@@ -70,7 +70,7 @@ stage('Build') {
                       mkdir ${srcDir}/build
                     fi
                     cd ${srcDir}/build
-                    /Applications/CMake.app/Contents/bin/cmake -G Xcode -D NASM=/usr/local/bin/nasm ${srcDir} .. ''' +
+                    /Applications/CMake.app/Contents/bin/cmake -G Xcode ${srcDir} .. ''' +
                     flags + '''
                     xcodebuild -quiet
                     '''
diff --git a/ext/ghoul b/ext/ghoul
index d1b4177c44..67827b142e 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit d1b4177c4456fed24686b44f9e69cf23c7fe43ee
+Subproject commit 67827b142e95122b66d58e7c402fe1a28a65631e
diff --git a/openspace.cfg b/openspace.cfg
index 63e01fe668..aea8c89557 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -10,7 +10,7 @@ return {
     SGCTConfig = sgct.config.single{},
 
     -- A regular 1920x1080 window
-    -- SGCTConfig = sgct.config.single{1920, 1080},
+    -- SGCTConfig = sgct.config.single{1920, 1080},   
 
     -- A 1k fisheye rendering
     -- SGCTConfig = sgct.config.fisheye{1024, 1024},
@@ -19,7 +19,7 @@ return {
     -- SGCTConfig = sgct.config.fisheye{1024, 1024, res={4096, 4096}, quality="2k", tilt=27},
 
     -- Streaming OpenSpace via Spout to OBS
-    -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"},
+    -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"},   
 
 
     --SGCTConfig = "${CONFIG}/openvr_oculusRiftCv1.xml",
@@ -48,8 +48,7 @@ return {
         CONFIG = "${BASE_PATH}/config",
         CACHE = "${BASE_PATH}/cache",
         FONTS = "${OPENSPACE_DATA}/fonts",
-        DOCUMENTATION = "${BASE_PATH}/documentation",
-        LOGS = "${BASE_PATH}/logs"
+        DOCUMENTATION = "${BASE_PATH}/documentation"
     },
     Fonts = {
         Mono = "${FONTS}/Droid_Sans_Mono/DroidSansMono.ttf",
@@ -57,12 +56,11 @@ return {
         Console = "${FONTS}/Inconsolata/Inconsolata-Regular.ttf"
     },
     Logging = {
-        LogDir = "${LOGS}",
         -- LogLevel = "Trace",
         LogLevel = "Debug",
         ImmediateFlush = true,
         Logs = {
-            { Type = "html", File = "${LOGS}/log.html", Append = false }
+            { Type = "html", File = "${BASE_PATH}/log.html", Append = false }
         },
         CapabilitiesVerbosity = "Full"
     },
@@ -71,7 +69,7 @@ return {
     },
     LuaDocumentation = "${DOCUMENTATION}/LuaScripting.html",
     PropertyDocumentation = "${DOCUMENTATION}/Properties.html",
-    ScriptLog = "${LOGS}/ScriptLog.txt",
+    ScriptLog = "${BASE_PATH}/ScriptLog.txt",
     KeyboardShortcuts = "${DOCUMENTATION}/KeyboardMapping.html",
     Documentation = "${DOCUMENTATION}/Documentation.html",
     FactoryDocumentation = "${DOCUMENTATION}/FactoryDocumentation.html",