Some more Makefile mods