Syncing fixes.