Sync fixes