Makefile: more tweaks