Misc. Makefile improvements