More Makefile changes