Fixed some Makefile issues