diff --git a/lib/libimhex/source/api/imhex_api.cpp b/lib/libimhex/source/api/imhex_api.cpp
index 40d50746e..7b761e2a8 100644
--- a/lib/libimhex/source/api/imhex_api.cpp
+++ b/lib/libimhex/source/api/imhex_api.cpp
@@ -111,7 +111,7 @@ namespace hex {
             s_providers.erase(it);
 
             if (it - s_providers.begin() == s_currentProvider)
-                s_currentProvider = 0;
+                setCurrentProvider(0);
 
             delete provider;
         }
diff --git a/plugins/builtin/source/content/data_processor_nodes.cpp b/plugins/builtin/source/content/data_processor_nodes.cpp
index cd5062d6a..32ff66973 100644
--- a/plugins/builtin/source/content/data_processor_nodes.cpp
+++ b/plugins/builtin/source/content/data_processor_nodes.cpp
@@ -14,7 +14,6 @@
 
 #include <imgui.h>
 #include <hex/ui/imgui_imhex_extensions.h>
-#include <hex/ui/imgui_data_visualizers.hpp>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp
index 62412f170..b829f06cd 100644
--- a/plugins/builtin/source/content/views/view_pattern_editor.cpp
+++ b/plugins/builtin/source/content/views/view_pattern_editor.cpp
@@ -145,8 +145,7 @@ namespace hex::plugin::builtin {
             }
         });
 
-        EventManager::subscribe<EventFileUnloaded>(this, [this] {
-            this->m_textEditor.SetText("");
+        EventManager::subscribe<EventFileUnloaded>(this, [] {
             ImHexApi::Provider::get()->getPatternLanguageRuntime().abort();
         });