Tweaks to makefile.