Small cleanups to Makefile