More makefile fixes