More makefile updates