Some more Makefile improvements