syncing fixes