Makefile mods