toplevel Makefile fixes