Fixing opcodes