More Makefile fixes