more Oracle fixes :(