More makefile fixes....