Fix the rest of the needs deep copy stuff.