Minor improvements to disassembler