Few improvements in toplevel Makefile