Makefile nicety updates