Updates to Makefile