Fixes in Oracle and MySQL