Fix the OPT RR Version get code and simplify DO get/set