Makefile modifications

Makefile modifications