Fix Oracle issues