some oracle-centric changes