More opcode emitting fixes