Small fixes for oracle support