Oracle minor fixes