Some Makefile tweaks