fix two swapped opcodes and a mangled substring