and further Oracle fixes