diff --git a/source/dbconnection.pas b/source/dbconnection.pas
index fd101ed9..cc87a8c1 100644
--- a/source/dbconnection.pas
+++ b/source/dbconnection.pas
@@ -825,6 +825,7 @@ begin
   rx.Expression := '(-pw\s+")[^"]*(")';
   PlinkCmdDisplay := FConnection.Parameters.SSHPlinkExe + ' ' + rx.Replace(PlinkParameters, '${1}******${2}', True);
   FConnection.Log(lcInfo, f_('Attempt to create plink.exe process, waiting %ds for response ...', [FConnection.Parameters.SSHTimeout]));
+  FConnection.Log(lcInfo, PlinkCmdDisplay);
 
   // Prepare process
   FillChar(StartupInfo, SizeOf(StartupInfo), 0);
@@ -1617,16 +1618,20 @@ begin
         Status.Next;
       end;
       FServerVersionUntouched := DecodeAPIString(mysql_get_server_info(FHandle));
+      log(lcinfo, FServerVersionUntouched);
       Vars := GetSessionVariables(False);
       while not Vars.Eof do begin
         if Vars.Col(0) = 'version_compile_os' then
           FServerOS := Vars.Col(1);
         if Vars.Col(0) = 'hostname' then
           FRealHostname := Vars.Col(1);
+        if (Vars.Col(0) = 'version') and (Vars.Col(1) <> '') then
+          FServerVersionUntouched := Vars.Col(1);
         if (Vars.Col(0) = 'version_comment') and (Vars.Col(1) <> '') then
           FServerVersionUntouched := FServerVersionUntouched + ' - ' + Vars.Col(1);
         Vars.Next;
       end;
+      log(lcinfo, FServerVersionUntouched);
       if FDatabase <> '' then begin
         tmpdb := FDatabase;
         FDatabase := '';
@@ -2098,7 +2103,7 @@ begin
   Log(lcDebug, 'Ping server ...');
   if (FHandle=nil) or (PQping(FHandle) <> PQPING_OK) then begin
     // Be sure to release some stuff before reconnecting
-  //log(lcinfo, 'TPGConnection.Ping reconnect: handle:'+inttostr(integer(FHandle=nil))+' '+inttostr(integer(PQping(FHandle))));
+  log(lcinfo, 'TPGConnection.Ping reconnect: handle:'+inttostr(integer(FHandle=nil))+' '+inttostr(integer(PQping(FHandle))));
     //Active := False;
     //if Reconnect then
     //  Active := True;
@@ -2906,19 +2911,17 @@ end;
 
 function TPGConnection.GetAllDatabases: TStringList;
 begin
-  Result := inherited;
-  if not Assigned(Result) then begin
-    try
-      // Query is.schemata when using schemata, for databases use pg_database
-      //FAllDatabases := GetCol('SELECT datname FROM pg_database WHERE datistemplate=FALSE');
-      FAllDatabases := GetCol('SELECT '+QuoteIdent('schema_name')+
-        ' FROM '+QuoteIdent('information_schema')+'.'+QuoteIdent('schemata')+
-        ' ORDER BY '+QuoteIdent('schema_name'));
-    except on E:EDatabaseError do
-      FAllDatabases := TStringList.Create;
-    end;
-    Result := FAllDatabases;
+  // Do not inherit, as in PG we cannot use the
+  if not Assigned(FAllDatabases) then try
+    // Query is.schemata when using schemata, for databases use pg_database
+    //FAllDatabases := GetCol('SELECT datname FROM pg_database WHERE datistemplate=FALSE');
+    FAllDatabases := GetCol('SELECT '+QuoteIdent('schema_name')+
+      ' FROM '+QuoteIdent('information_schema')+'.'+QuoteIdent('schemata')+
+      ' ORDER BY '+QuoteIdent('schema_name'));
+  except on E:EDatabaseError do
+    FAllDatabases := TStringList.Create;
   end;
+  Result := FAllDatabases;
 end;
 
 
@@ -3937,7 +3940,7 @@ begin
       obj.Name := Results.Col('table_name');
       obj.Created := 0;
       obj.Updated := 0;
-      obj.Database := db;
+      //obj.Database := db;
       obj.Schema := Results.Col('table_schema'); // Remove when using schemata
       obj.Comment := Results.Col('comment');
       obj.Rows := StrToIntDef(Results.Col('reltuples'), obj.Rows);