diff --git a/src/Insight/UserInterfaces/InsightWindow/UiLoader.cpp b/src/Insight/UserInterfaces/InsightWindow/UiLoader.cpp
index a15eb530..b0e40e18 100644
--- a/src/Insight/UserInterfaces/InsightWindow/UiLoader.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/UiLoader.cpp
@@ -104,11 +104,11 @@ namespace Bloom
     }
 
     QWidget* UiLoader::createWidget(const QString& className, QWidget* parent, const QString& name) {
-        const auto widgetContructorIt = this->customWidgetConstructorsByWidgetName.find(className);
+        const auto widgetConstructorIt = this->customWidgetConstructorsByWidgetName.find(className);
 
-        if (widgetContructorIt != this->customWidgetConstructorsByWidgetName.end()) {
+        if (widgetConstructorIt != this->customWidgetConstructorsByWidgetName.end()) {
             // This is a custom widget - call the mapped constructor
-            return widgetContructorIt->second(parent, name);
+            return widgetConstructorIt->second(parent, name);
         }
 
         return QUiLoader::createWidget(className, parent, name);
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/PanelWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/PanelWidget.hpp
index 5f6cbd27..b98c1afa 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/PanelWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/PanelWidget.hpp
@@ -2,6 +2,7 @@
 
 #include <QFrame>
 #include <QSize>
+#include <optional>
 #include <QEvent>
 #include <QMouseEvent>
 #include <QEnterEvent>
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp
index da2b6a7c..12d7a79b 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/AnnotationItem.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <QGraphicsItem>
-#include <QFont>
 #include <cstdint>
+#include <optional>
+#include <QFont>
 
 #include "src/Targets/TargetMemory.hpp"
 
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp
index d25ed78f..9487f687 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ValueAnnotationItem.hpp
@@ -3,6 +3,7 @@
 #include <QPainter>
 #include <QWidget>
 #include <QStyleOptionGraphicsItem>
+#include <optional>
 
 #include "AnnotationItem.hpp"
 
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/RegisterWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/RegisterWidget.hpp
index c9c27c44..8ef34cf5 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/RegisterWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/RegisterWidget.hpp
@@ -2,6 +2,7 @@
 
 #include <QWidget>
 #include <unordered_set>
+#include <optional>
 #include <QHBoxLayout>
 #include <QAction>
 #include <QSize>
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp
index 343a4d2e..2ecef2b1 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPackageWidget.hpp
@@ -4,6 +4,7 @@
 #include <utility>
 #include <vector>
 #include <map>
+#include <optional>
 
 #include "TargetPinWidget.hpp"
 #include "src/Targets/TargetVariant.hpp"
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp
index 61943dd7..42a30480 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetWidgets/TargetPinWidget.hpp
@@ -2,6 +2,7 @@
 
 #include <QWidget>
 #include <utility>
+#include <optional>
 
 #include "src/Targets/TargetVariant.hpp"
 #include "src/Targets/TargetPinDescriptor.hpp"
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TextInput.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TextInput.cpp
index 6c16086b..cbceafb5 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TextInput.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TextInput.cpp
@@ -5,7 +5,9 @@
 
 namespace Bloom::Widgets
 {
-    TextInput::TextInput(QWidget* parent): QLineEdit(parent) {}
+    TextInput::TextInput(QWidget* parent)
+        : QLineEdit(parent)
+    {}
 
     void TextInput::contextMenuEvent(QContextMenuEvent* event) {
         if (QMenu* menu = this->createStandardContextMenu()) {