fix oracle and 2.9 issues