Updated Makefile targets