Modify makefiles