Changes that increase oracle compatiblity