diff --git a/lib/c/2006/Makefile b/lib/c/2006/Makefile
index 194b0bc056854bc8cea137a3113b31943ab503a9..6ad51a63180dac3d6e07c3d6a6a71c4cd8101b5b 100644
--- a/lib/c/2006/Makefile
+++ b/lib/c/2006/Makefile
@@ -24,7 +24,7 @@ OBJS=labcomm$(VERSION).o \
      labcomm$(VERSION)_pthread_scheduler.o 
 
 LABCOMM_JAR=../../../compiler/labcomm$(LIBVERSION)_compiler.jar
-LABCOMM=java -jar $(LABCOMM_JAR) 
+LABCOMM=java -jar $(LABCOMM_JAR)
 
 TESTS=test_labcomm_basic_type_encoding \
       test_labcomm_generated_encoding \
@@ -96,6 +96,7 @@ $(TEST_DIR)/gen/%.o: $(TEST_DIR)/%.c | $(TEST_DIR)/gen
 .PRECIOUS: $(TEST_DIR)/gen/%.h
 $(TEST_DIR)/gen/%.c $(TEST_DIR)/gen/%.h: $(TEST_DIR)/%.lc | $(TEST_DIR)/gen
 	$(LABCOMM) \
+		--ver=$(VERSION) \
 		--c=$(TEST_DIR)/gen/$*.c \
 		--h=$(TEST_DIR)/gen/$*.h \
 		$<
diff --git a/lib/c/Makefile b/lib/c/Makefile
index de73c0473010a4d81e80cb18f356bb08561afb6d..c2b23ee9f9373497e4e1ae612a99ed1ee903110a 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -8,6 +8,6 @@ all:
 
 .PHONY: distclean
 distclean: 
-	rm *.o *.so *.so.1 *.a
-	for v in $(VERSIONS) ; do $(MAKE) -C $${v} distclean ; done
+	for v in $(VERSIONS) ; do $(MAKE) -C $${v} $@ || exit 1 ; done
+	rm -f *.o *.so *.so.1 *.a