More changes to Makefile