serialize: fixes from sync commit