Fix bugs in ExtendedJDBCOAICatalog.java