Even more fixes to Makefile.