diff --git a/planning/include/tesseract_qt/planning/models/task_composer_node_info_map_standard_item.h b/planning/include/tesseract_qt/planning/models/task_composer_node_info_map_standard_item.h
index 17f7737..875d55d 100644
--- a/planning/include/tesseract_qt/planning/models/task_composer_node_info_map_standard_item.h
+++ b/planning/include/tesseract_qt/planning/models/task_composer_node_info_map_standard_item.h
@@ -43,18 +43,18 @@ class TaskComposerNodeInfoMapStandardItem : public QStandardItem
 {
 public:
   explicit TaskComposerNodeInfoMapStandardItem(
-      const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map);
+      const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map);
   TaskComposerNodeInfoMapStandardItem(
       const QString& text,
-      const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map);
+      const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map);
   TaskComposerNodeInfoMapStandardItem(
       const QIcon& icon,
       const QString& text,
-      const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map);
+      const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map);
   int type() const override;
 
 private:
-  void ctor(const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map);
+  void ctor(const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map);
 };
 }  // namespace tesseract_gui
 
diff --git a/planning/src/models/task_composer_node_info_map_standard_item.cpp b/planning/src/models/task_composer_node_info_map_standard_item.cpp
index 7b8688a..9a69b24 100644
--- a/planning/src/models/task_composer_node_info_map_standard_item.cpp
+++ b/planning/src/models/task_composer_node_info_map_standard_item.cpp
@@ -34,7 +34,7 @@
 namespace tesseract_gui
 {
 TaskComposerNodeInfoMapStandardItem::TaskComposerNodeInfoMapStandardItem(
-    const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map)
+    const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map)
   : QStandardItem(icons::getUnknownIcon(), "Task Composer Node Info Map")
 {
   ctor(info_map);
@@ -42,7 +42,7 @@ TaskComposerNodeInfoMapStandardItem::TaskComposerNodeInfoMapStandardItem(
 
 TaskComposerNodeInfoMapStandardItem::TaskComposerNodeInfoMapStandardItem(
     const QString& text,
-    const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map)
+    const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map)
   : QStandardItem(icons::getUnknownIcon(), text)
 {
   ctor(info_map);
@@ -51,7 +51,7 @@ TaskComposerNodeInfoMapStandardItem::TaskComposerNodeInfoMapStandardItem(
 TaskComposerNodeInfoMapStandardItem::TaskComposerNodeInfoMapStandardItem(
     const QIcon& icon,
     const QString& text,
-    const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map)
+    const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map)
   : QStandardItem(icon, text)
 {
   ctor(info_map);
@@ -63,13 +63,13 @@ int TaskComposerNodeInfoMapStandardItem::type() const
 }
 
 void TaskComposerNodeInfoMapStandardItem::ctor(
-    const std::map<boost::uuids::uuid, std::unique_ptr<tesseract_planning::TaskComposerNodeInfo>>& info_map)
+    const std::map<boost::uuids::uuid, tesseract_planning::TaskComposerNodeInfo>& info_map)
 {
   for (const auto& pair : info_map)
   {
-    auto* item_desc = new QStandardItem(pair.second->name.c_str());
+    auto* item_desc = new QStandardItem(pair.second.name.c_str());
     QString item_text = QString::fromStdString(boost::uuids::to_string(pair.first));
-    appendRow({ new TaskComposerNodeInfoStandardItem(item_text, *pair.second), item_desc });
+    appendRow({ new TaskComposerNodeInfoStandardItem(item_text, pair.second), item_desc });
   }
 }
 }  // namespace tesseract_gui
diff --git a/studio/src/studio.cpp b/studio/src/studio.cpp
index e994745..508e766 100644
--- a/studio/src/studio.cpp
+++ b/studio/src/studio.cpp
@@ -23,7 +23,7 @@
 #include <tesseract_qt/studio/studio.h>
 #include "ui_studio.h"
 
-#include <tesseract_common/plugin_loader.hpp>
+#include <tesseract_common/plugin_loader.h>
 #include <tesseract_common/yaml_utils.h>
 #include <tesseract_common/yaml_extenstions.h>
 #include <tesseract_common/filesystem.h>