Makefile modifications...