Fix some opcodes erorrs with 6.0.3