Makefile changes