Bug fixes with disassembler