Latest updates to Makefile