Minor tweaks to makefiles