diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index 3fd49543b3..9f2547e4fe 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -175,8 +175,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo '*** Building HTML ***'
 	test -d html || mkdir html
 	cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \
-	    cp $(srcdir)/$$i html ; done
+	test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \
+	    if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done
 	@echo '-- Fixing Crossreferences' 
 	LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
@@ -285,8 +285,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
 
 	images=$(HTML_IMAGES) ;    	      \
-	for i in $$images ; do		      \
-	  cp $(srcdir)/$$i $(distdir)/html ;  \
+	for i in "" $$images ; do		      \
+	  if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
 	done
 
 .PHONY : dist-hook-local
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index f3ef7f7355..90232a4ca2 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -175,8 +175,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo '*** Building HTML ***'
 	test -d html || mkdir html
 	cd html && gtkdoc-mkhtml $(DOC_MODULE) $(srcdir)/../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || for i in $(HTML_IMAGES) ; do \
-	    cp $(srcdir)/$$i html ; done
+	test "x$(HTML_IMAGES)" = "x" || for i in "" $(HTML_IMAGES) ; do \
+	    if test "$$i" != ""; then cp $(srcdir)/$$i html ; fi; done
 	@echo '-- Fixing Crossreferences' 
 	LANG=C && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
@@ -284,8 +284,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
 
 	images=$(HTML_IMAGES) ;    	      \
-	for i in $$images ; do		      \
-	  cp $(srcdir)/$$i $(distdir)/html ;  \
+	for i in "" $$images ; do		      \
+	  if test "$$i" != ""; then cp $(srcdir)/$$i $(distdir)/html ; fi; \
 	done
 
 .PHONY : dist-hook-local
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index ac6ffb3ec4..2d6d100e97 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -35,7 +35,12 @@
 #include "config.h"
 #include "gstfilter.h"
 
+
+#ifndef GST_DISABLE_GST_DEBUG
 #define GST_CAT_DEFAULT GST_CAT_PLUGIN_LOADING
+#else
+#define GST_CAT_DEFAULT 0
+#endif
 
 static GModule *main_module = NULL;
 static GList *_gst_plugin_static = NULL;
diff --git a/gst/parse/Makefile.am b/gst/parse/Makefile.am
index 8914159e7a..d170f55824 100644
--- a/gst/parse/Makefile.am
+++ b/gst/parse/Makefile.am
@@ -21,7 +21,9 @@ noinst_HEADERS = grammar.tab.h
 grammar.tab.c grammar.tab.h: grammar.y ../gstmarshal.h
 	$(BISON_PATH) -d -v -p_gst_parse__yy $(srcdir)/grammar.y -o grammar.tab.c
  
-lex._gst_parse_yy.c: parse.l grammar.tab.h
+parse.l : grammar.tab.h
+
+lex._gst_parse_yy.c: parse.l 
 	$(FLEX_PATH) -P_gst_parse_yy $^
 
 ## this is so make install without a previous make can work, because