diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
index dccdefed2..628885efc 100644
--- a/lib/takeover/metasploit.py
+++ b/lib/takeover/metasploit.py
@@ -399,8 +399,13 @@ class Metasploit:
             if extra is not None:
                 self.__payloadCmd += " %s" % extra
 
-        # TODO: payload stager for Linux can not be encoded as long as
-        # Metasploit developers do not commit my minor patch for msfencode
+        # NOTE: payload stager for Linux can only be encoded if the
+        # Metasploit working copy has been updated after May 11, 2009
+        # (http://trac.metasploit.com/changeset/6543)
+        #
+        # TODO: remember to update this code as soon as Metasploit
+        # Framework 3.3 is out officially and update the user's manual to
+        # notify that sqlmap depends upon Metasploit Framework 3.3
         else:
             self.__payloadCmd += " X > %s" % outFile
 
diff --git a/plugins/dbms/mssqlserver.py b/plugins/dbms/mssqlserver.py
index 7308be215..8567e2a09 100644
--- a/plugins/dbms/mssqlserver.py
+++ b/plugins/dbms/mssqlserver.py
@@ -604,13 +604,14 @@ class MSSQLServerMap(Fingerprint, Enumeration, Filesystem, Miscellaneous, Takeov
 
         logger.info("restarting Microsoft SQL Server, wait..")
         time.sleep(15)
+
         # TODO: use 'sc' to:
         # * Warn the user that sqlmap needs to restart the SQL Server
         #   service, ask for confirmation
         # * Stop the SQL Server service (after handling DEP)
         # * Start the SQL Server service (after handling DEP)
 
-        # Another way to restart MSSQL consists of writing a  bat file with
+        # Another way to restart MSSQL consists of writing a bat file with
         # the following text:
         #
         #@ECHO OFF