Fixed more Makefile issues