Minor Oracle Fixes
Merge branch 'develop' into issue-1788