diff --git a/lib/takeover/udf.py b/lib/takeover/udf.py
index 8630ae2cf..f8bfc7cee 100644
--- a/lib/takeover/udf.py
+++ b/lib/takeover/udf.py
@@ -83,8 +83,7 @@ class UDF:
             self.udfToCreate.add(udf)
 
     def udfCreateSupportTbl(self, dataType):
-        debugMsg  = "creating a support table to write commands standard "
-        debugMsg += "output to"
+        debugMsg = "creating a support table for user-defined functions"
         logger.debug(debugMsg)
 
         self.createSupportTbl(self.cmdTblName, self.tblField, dataType)
diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py
index 1a7ef9902..dbe4ae861 100644
--- a/plugins/generic/filesystem.py
+++ b/plugins/generic/filesystem.py
@@ -270,7 +270,7 @@ class Filesystem:
 
             fileContent = self.stackedReadFile(rFile)
 
-        if fileContent in ( None, "" ):
+        if fileContent in ( None, "" ) and kb.dbms != "PostgreSQL":
             self.cleanup(onlyFileTbl=True)
 
             return
@@ -288,7 +288,8 @@ class Filesystem:
         fileContent = self.__unhexString(fileContent)
         rFilePath = dataToOutFile(fileContent)
 
-        self.cleanup(onlyFileTbl=True)
+        if kb.dbms != "PostgreSQL":
+            self.cleanup(onlyFileTbl=True)
 
         return rFilePath