diff --git a/apps/Launcher/mainwindow.cpp b/apps/Launcher/mainwindow.cpp
index 9d97a0ffe3..7d17454a89 100644
--- a/apps/Launcher/mainwindow.cpp
+++ b/apps/Launcher/mainwindow.cpp
@@ -191,7 +191,7 @@ void MainWindow::initialize() {
 
     ghoul::logging::LogManager::initialize(ghoul::logging::LogManager::LogLevel::Debug);
     LogMgr.addLog(new ghoul::logging::ConsoleLog);
-    LogMgr.addLog(new ghoul::logging::HTMLLog("LauncherLog.html"));
+    LogMgr.addLog(new ghoul::logging::HTMLLog("LauncherLog.html", false));
     LogMgr.addLog(new QLog);
 
     std::string configurationFile = _configurationFile;
diff --git a/ext/ghoul b/ext/ghoul
index ba03caa1d5..d2485fb363 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit ba03caa1d50a990de4ff695e2e0577cdaa1d67b5
+Subproject commit d2485fb363247193601a63eda0a90ec086ee602d
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index bd82114c05..fc48441157 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -226,14 +226,20 @@ std::vector<DownloadManager::FileFuture*> DownloadManager::downloadRequestFiles(
         int nFinished = 0;
         while (std::getline(temporary, line)) {
             ++nFiles;
+#ifdef __APPLE__
+            // @TODO: Fix this so that the ifdef is not necessary anymore ---abock
             std::string file = ghoul::filesystem::File(line, true).filename();
+#else
+            std::string file = ghoul::filesystem::File(line).filename();
+#endif
 
             LDEBUG("\tLine: " << line << " ; Dest: " << destination.path() + "/" + file);
 
             FileFuture* future = DlManager.downloadFile(
                 line,
                 destination.path() + "/" + file,
-                overrideFiles
+                overrideFiles,
+                [](const FileFuture& f) { LDEBUG("Finished: " << f.filePath); }
             );
             if (future)
                 futures.push_back(future);
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 43992af703..f4a7d7b417 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -178,12 +178,12 @@ bool RenderEngine::initialize() {
 	_mainCamera->setPosition(psc(0.f, 0.f, 1.499823f, 11.f));
 	OsEng.interactionHandler()->setCamera(_mainCamera);
 
-#ifdef GHOUL_USE_FREEIMAGE
-    ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderFreeImage);
-#endif // GHOUL_USE_FREEIMAGE
 #ifdef GHOUL_USE_DEVIL
 	ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderDevIL);
 #endif // GHOUL_USE_DEVIL
+#ifdef GHOUL_USE_FREEIMAGE
+    ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderFreeImage);
+#endif // GHOUL_USE_FREEIMAGE
 
 	ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderCMAP);