More Makefile modifications