Oracle compatibility and some improvements to override