Makefile improvements

A couple of simple improvements for our `Makefile`.