Fix some opcodes errors for 6.0.2/6.0.3