Minor fixes in Makefile