Various Makefile fixes