Updated makefiles