Fix two bugs in Oracle Support