Correcting some makefile issues