Tweaks a few Makefiles