OP-5810 - Review comment fixes.