Makefile fixes.