Fix some makefile errors