More ORA fixes for opaque-keys.
Merge pull request #3709 from edx/fix-ora-errors

Some more places where we have ORA errors