Fix bugs in disassembler