Updates to sync to prevent issues with serialization