Some Makefile polishing