More missing ORA fixes.
Merge pull request #3713 from edx/fix-ora-errors

More missing ORA fixes.