More makefile tweaks