Some Makefile fixes