A few small Makefile improvements