Fix for orace/mysql.
Enhancements for DB.