Minor disassembly tweaks