BR 1834292: Fix multiple disassembler bugs