diff --git a/include/villas/nodes/cbuilder.h b/include/villas/nodes/cbuilder.h
index fb2675ed8..cb83ced7f 100644
--- a/include/villas/nodes/cbuilder.h
+++ b/include/villas/nodes/cbuilder.h
@@ -21,8 +21,6 @@
 struct cbuilder;
 
 struct cbuilder_model {
-	char *name;
-
 	void (*code)();
 	void (*ram)();
 	
diff --git a/lib/nodes/cbuilder.c b/lib/nodes/cbuilder.c
index 041a7e2f4..98d70ec5c 100644
--- a/lib/nodes/cbuilder.c
+++ b/lib/nodes/cbuilder.c
@@ -123,7 +123,7 @@ static struct plugin p = {
 		.open		= cbuilder_open,
 		.close		= cbuilder_close,
 		.read		= cbuilder_read,
-		.write		= cbuilder_write,
+		.write		= cbuilder_write
 	}
 };
 
diff --git a/lib/plugin.c b/lib/plugin.c
index 556e7e378..4ac431457 100644
--- a/lib/plugin.c
+++ b/lib/plugin.c
@@ -52,9 +52,9 @@ int plugin_destroy(struct plugin *p)
 {
 	if (p->state == PLUGIN_STATE_LOADED)
 		plugin_unload(p);
-	
-	free(p->name);
-	free(p->path);
+
+	if (p->path)
+		free(p->path);
 	
 	return 0;
 }