Updated makefile to fix issues