Edits to the makefiles