Fixes to the Makefile.