Makefile: More tweaks