More makefile corrections