diff --git a/common b/common
index 09832330c..0c35a58b7 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 09832330c1e88710a60d3ed5db785c1403c50735
+Subproject commit 0c35a58b79b00726d13675b7a6231dd35bf62a20
diff --git a/include/villas/plugin.h b/include/villas/plugin.h
index 017b02189..d2a4c9571 100644
--- a/include/villas/plugin.h
+++ b/include/villas/plugin.h
@@ -53,7 +53,7 @@ __attribute__((constructor(110))) static void UNIQUE(__ctor)() {\
 }								\
 __attribute__((destructor(110))) static void UNIQUE(__dtor)() {	\
 	if (plugins.state != STATE_DESTROYED)			\
-		vlist_remove(&plugins, p);			\
+		vlist_remove_all(&plugins, p);			\
 }
 
 extern struct vlist plugins;
diff --git a/lib/node.c b/lib/node.c
index 9a23bf183..a25e0ff22 100644
--- a/lib/node.c
+++ b/lib/node.c
@@ -533,7 +533,7 @@ int node_destroy(struct node *n)
 			return ret;
 	}
 
-	vlist_remove(&node_type(n)->instances, n);
+	vlist_remove_all(&node_type(n)->instances, n);
 
 	if (n->_vd)
 		free(n->_vd);
diff --git a/lib/nodes/websocket.c b/lib/nodes/websocket.c
index 7f67b25c7..9a17ca0c6 100644
--- a/lib/nodes/websocket.c
+++ b/lib/nodes/websocket.c
@@ -267,7 +267,7 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
 			}
 
 			if (connections.state == STATE_INITIALIZED)
-				vlist_remove(&connections, c);
+				vlist_remove_all(&connections, c);
 
 			if (c->state == WEBSOCKET_CONNECTION_STATE_INITIALIZED)
 				websocket_connection_destroy(c);