diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp
index a83b13c327..d5ed49e0a9 100644
--- a/apps/TaskRunner/main.cpp
+++ b/apps/TaskRunner/main.cpp
@@ -40,6 +40,7 @@
 
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/rendering/renderable.h>
+#include <openspace/rendering/dashboarditem.h>
 #include <openspace/util/progressbar.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/configurationmanager.h>
@@ -150,6 +151,10 @@ int main(int argc, char** argv) {
         std::make_unique<ghoul::TemplateFactory<ResourceSynchronization>>(),
         "ResourceSynchronization"
     );
+    FactoryManager::ref().addFactory(
+        std::make_unique<ghoul::TemplateFactory<DashboardItem>>(),
+        "DashboardItem"
+    );
 
 
     openspace::ConfigurationManager configuration;
@@ -181,7 +186,7 @@ int main(int argc, char** argv) {
     std::string tasksPath = "";
     commandlineParser.addCommand(
         std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
-            &tasksPath,
+            tasksPath,
             "--task",
             "-t",
             "Provides the path to a task file to execute"
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index d3cacbf912..540c18b539 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -30,6 +30,7 @@
 #include <ghoul/glm.h>
 #include <ghoul/misc/boolean.h>
 
+#include <atomic>
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/include/openspace/scene/sceneinitializer.h b/include/openspace/scene/sceneinitializer.h
index 26c46db4f2..23c478f39e 100644
--- a/include/openspace/scene/sceneinitializer.h
+++ b/include/openspace/scene/sceneinitializer.h
@@ -27,7 +27,7 @@
 
 #include <openspace/scene/scenegraphnode.h>
 
-#include <ghoul/misc/threadpool.h>
+#include <openspace/util/threadpool.h>
 
 #include <mutex>
 
@@ -55,7 +55,7 @@ public:
     std::vector<SceneGraphNode*> getInitializedNodes() override;
 private:
     std::vector<SceneGraphNode*> _initializedNodes;
-    ghoul::ThreadPool _threadPool;
+    ThreadPool _threadPool;
     std::mutex _mutex;
     
 };
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index fd76fbeab7..50e24fb35f 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -47,7 +47,7 @@ MultiThreadedSceneInitializer::MultiThreadedSceneInitializer(unsigned int nThrea
 {}
     
 void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
-     auto initFunction = [this](SceneGraphNode* node) {
+     auto initFunction = [this, node]() {
          node->initialize();
          std::lock_guard<std::mutex> g(_mutex);
          LDEBUG("Thread Initialized " << node->name());
@@ -55,7 +55,7 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
      };
 
     std::lock_guard<std::mutex> g(_mutex);
-    _threadPool.queue(initFunction, node);
+    _threadPool.enqueue(initFunction);
     node->initialize();
 }