fixes for oracle and db2