diff --git a/JUCE/modules/juce_product_unlocking/marketplace/juce_OnlineUnlockStatus.h b/JUCE/modules/juce_product_unlocking/marketplace/juce_OnlineUnlockStatus.h
index 7708d469f8..0ea55004c7 100644
--- a/JUCE/modules/juce_product_unlocking/marketplace/juce_OnlineUnlockStatus.h
+++ b/JUCE/modules/juce_product_unlocking/marketplace/juce_OnlineUnlockStatus.h
@@ -149,15 +149,12 @@ class JUCE_API  OnlineUnlockStatus
     {
 		auto s = getPublicKey().toString().fromFirstOccurrenceOf(",", false, false);
 
-        var rv(true);
-        var x = status[unlockedProp] && s.contains(otherString);
+        var x = s.contains(otherString);
 
-        if(status[unlockedProp] && !x)
-            std::swap(x, rv);
-
-        status.setProperty(unlockedProp, x, nullptr);
+        if(!x)
+            status.setProperty(unlockedProp, false, nullptr);
         
-        return rv;
+        return x;
     }
 
     /** Returns the Time when the keyfile expires.
diff --git a/currentGitHash.txt b/currentGitHash.txt
index 6ac18c0502..72ece4fc6b 100644
--- a/currentGitHash.txt
+++ b/currentGitHash.txt
@@ -1 +1 @@
-08a7dac9e7d0bea920fd7d3bf7b36ae23ac8f1e0
+35da98ae75eb8d7d856ba083fb31fe44d37491a6
diff --git a/hi_backend/backend/currentGit.h b/hi_backend/backend/currentGit.h
index 41df64c4af..20cab9327a 100644
--- a/hi_backend/backend/currentGit.h
+++ b/hi_backend/backend/currentGit.h
@@ -1 +1 @@
-#define PREVIOUS_HISE_COMMIT "08a7dac9e7d0bea920fd7d3bf7b36ae23ac8f1e0" 
+#define PREVIOUS_HISE_COMMIT "35da98ae75eb8d7d856ba083fb31fe44d37491a6" 
diff --git a/hi_scripting/scripting/scriptnode/ui/DspNetworkComponents.cpp b/hi_scripting/scripting/scriptnode/ui/DspNetworkComponents.cpp
index 233a0a0277..da627ffa99 100644
--- a/hi_scripting/scripting/scriptnode/ui/DspNetworkComponents.cpp
+++ b/hi_scripting/scripting/scriptnode/ui/DspNetworkComponents.cpp
@@ -2552,10 +2552,12 @@ void KeyboardPopup::addNodeAndClose(String path)
 
 	std::function<void(Component*)> cleanup = [pc](Component* c)
 	{
+#if USE_BACKEND
 		if(pc)
 			c->findParentComponentOfClass<ZoomableViewport>()->setCurrentModalWindow(nullptr, {});
 		else
 			c->findParentComponentOfClass<BackendRootWindow>()->clearModalComponent();
+#endif
 	};
 
 	auto container = node.get();