Fixed issues with Makefile