remote sync fixes 2