Stability fixes for Oracle

Can we include these 2 fixes in the next release?