Tweaks to makefile