Makefiles fixes.