Final makefile fixes.