Fix typo in Makefile
Improve some Makefile targets