Fix some deep clone issues.