Fixed makefile targets