Fixed issues with makefile