more syncing fixes