Sync fields with disassembly