remote sync fixes