Improve makefile targets