diff --git a/c++/carla-includes/carla_lv2.h b/c++/carla-includes/carla_lv2.h
index 93c40c9..f757968 100644
--- a/c++/carla-includes/carla_lv2.h
+++ b/c++/carla-includes/carla_lv2.h
@@ -307,11 +307,11 @@ public:
 
     void init()
     {
-        if (needInit)
-        {
-            needInit = false;
-            load_all();
-        }
+        if (! needInit)
+            return;
+
+        load_all();
+        needInit = false;
     }
 
 private:
diff --git a/c++/carla-lilv/lilv-0.14.4/lilv/lilvmm.hpp b/c++/carla-lilv/lilv-0.14.4/lilv/lilvmm.hpp
index 749a0c9..1775d14 100644
--- a/c++/carla-lilv/lilv-0.14.4/lilv/lilvmm.hpp
+++ b/c++/carla-lilv/lilv-0.14.4/lilv/lilvmm.hpp
@@ -60,7 +60,7 @@ uri_to_path(const char* uri) {
 #endif
 
 struct Node {
-	inline Node(const LilvNode* node) : me(lilv_node_duplicate(node)) {}
+	inline Node(const LilvNode* node) : me(lilv_node_duplicate(node)) { lilv_node_free((LilvNode*)node); }
 	inline Node(const Node& copy)     : me(lilv_node_duplicate(copy.me)) {}
 
 	inline ~Node() { lilv_node_free(me); }