SQLite issue fixed
SQLite & PostgreSQL issues fixed
Minor fixes