Correct some Makefile problems