More makefile modifications