Makefile tweaks for consistency and simplicity