Fixes in Makefile