Changed makefiles