Crucible server/client sync fixes