Add small fixes to Makefile