Fixed some makefile issues