Some more Makefile tweaks