Tweaks to the makefile