backend sync fixes