small opcode changes to be more in sync with the original