Bug fixes in Makefile.