Disassembler bug fixes