Update Makefile

Needed changes to merge.