Even more Makefile tweaks