Miscellaneous Makefile improvements