Makefile.classic fixups

Some Makefile.classic fixups.