Some Oracle improvements