Tweaks for potential oracle compatibility
Merge branch 'master' into oracle