Further fixes in the Oracle setup