More makefile changes