fixups on sync