Makefile improvements

Small improvements I stumbled into when trying to "build" this project.