Minor changes at new Top Makefile.