More oracle fixes (work in progress)