Makefile modifications