Modified makefiles