Makefile tweaks
This will need to be -02 when the time comes.