Sync improvments.