Sweeping Makefile fixes.