Fix some makefile targets