Some minor makefile fixes.