diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 47fc72f5e52..292f38b9472 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1534,13 +1534,15 @@ void NodeTagChanged(bNodeTree *ntree, bNode *node)
 
 int NodeTagIDChanged(bNodeTree *ntree, ID *id)
 {
-	bNodeTreeType *ntreetype = ntreeGetType(ntree->type);
+	bNodeTreeType *ntreetype;
 	bNode *node;
 	int change = FALSE;
 
 	if(ELEM(NULL, id, ntree))
 		return change;
 	
+	ntreetype = ntreeGetType(ntree->type);
+	
 	if (ntreetype->update_node) {
 		for(node= ntree->nodes.first; node; node= node->next) {
 			if(node->id==id) {
diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c
index 8067f7e92be..d5ae442c25f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_common.c
+++ b/source/blender/nodes/composite/nodes/node_composite_common.c
@@ -135,7 +135,7 @@ static void *group_initexec(bNode *node)
 	return exec;
 }
 
-static void group_freeexec(bNode *node, void *nodedata)
+static void group_freeexec(bNode *UNUSED(node), void *nodedata)
 {
 	bNodeTreeExec *gexec= (bNodeTreeExec*)nodedata;