Makefile tweaks.