scope syncing fixes