Updates to Makefiles