diff --git a/lib/controller/handler.py b/lib/controller/handler.py
index ee6a0fb64..4cd32f16e 100644
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -48,7 +48,7 @@ def setHandler():
     management system.
     """
 
-    items = (
+    items = [
                   ("MySQL", MYSQL_ALIASES, MySQLMap, MySQLConn),
                   ("Oracle", ORACLE_ALIASES, OracleMap, OracleConn),
                   ("PostgreSQL", PGSQL_ALIASES, PostgreSQLMap, PostgreSQLConn),
@@ -59,9 +59,9 @@ def setHandler():
                   ("SAP MaxDB", MAXDB_ALIASES, MaxDBMap, MaxDBConn),
                   ("Sybase", SYBASE_ALIASES, SybaseMap, SybaseConn),
                   ("IBM DB2", DB2_ALIASES, DB2Map, DB2Conn)
-                )
+            ]
 
-    _ = max(_ if Backend.getIdentifiedDbms() in _[1] else None for _ in items)
+    _ = max(_ if (Backend.getIdentifiedDbms() or "").lower() in _[1] else None for _ in items)
     if _:
         items.remove(_)
         items.insert(0, _)
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 6b223c6d6..e9d24b9a2 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -852,7 +852,7 @@ class Enumeration:
                 return tableExists(paths.COMMON_TABLES)
 
         infoMsg = "fetching tables for database"
-        infoMsg += "%s: %s" % ("s" if len(dbs) > 1 else "", ", ".join(db if isinstance(db, basestring) else db[0] for db in sorted(dbs)))
+        infoMsg += "%s: '%s'" % ("s" if len(dbs) > 1 else "", ", ".join(db if isinstance(db, basestring) else db[0] for db in sorted(dbs)))
         logger.info(infoMsg)
 
         rootQuery = queries[Backend.getIdentifiedDbms()].tables
@@ -1781,7 +1781,7 @@ class Enumeration:
             errMsg += "back-end DBMS is MySQL < 5.0"
             raise sqlmapUnsupportedFeatureException, errMsg
 
-        infoMsg = "sqlmap will dump entries of all databases' tables now"
+        infoMsg = "sqlmap will dump entries of all tables from all databases now"
         logger.info(infoMsg)
 
         conf.tbl = None
@@ -1791,7 +1791,7 @@ class Enumeration:
 
         if kb.data.cachedTables:
             if isinstance(kb.data.cachedTables, list):
-                kb.data.cachedTables = {None : kb.data.cachedTables}
+                kb.data.cachedTables = { None: kb.data.cachedTables }
 
             for db, tables in kb.data.cachedTables.items():
                 conf.db = db