Minor Oracle Fixes