Added fixes for ORCL

shitty DBMS