makefile: Some more tweaks