Added copy fix and preserve-tree modifications