Makefile & support file tweaks