More Makefile tweaks