Added Makefile changes