Some makefile cleanups