Adjustments to support Oracle