diff --git a/monkey/infection_monkey/exploit/mssqlexec.py b/monkey/infection_monkey/exploit/mssqlexec.py
index 55f58b2eb..5286252ed 100644
--- a/monkey/infection_monkey/exploit/mssqlexec.py
+++ b/monkey/infection_monkey/exploit/mssqlexec.py
@@ -95,7 +95,7 @@ class MSSQLExploiter(HostExploiter):
             # Running the cmd on remote host
             for cmd in cmds:
                 cursor.execute(cmd)
-                sleep(0.5)
+                sleep(MSSQLExploiter.QUERY_BUFFER)
         except Exception as e:
             LOG.error('Error sending the payload using xp_cmdshell to host: %s' % e)
             return False
diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
index 7c8cd5eee..d741727ce 100644
--- a/monkey/infection_monkey/monkey.py
+++ b/monkey/infection_monkey/monkey.py
@@ -178,7 +178,8 @@ class InfectionMonkey(object):
                 if monkey_tunnel:
                     monkey_tunnel.set_tunnel_for_host(machine)
                 if self._default_server:
-                    machine.set_default_server(get_interface_to_target(machine.ip_addr)+':'+self._default_server_port)
+                    machine.set_default_server(get_interface_to_target(machine.ip_addr) +
+                                               (':'+self._default_server_port if self._default_server_port else ''))
                     LOG.debug("Default server: %s set to machine: %r" % (self._default_server, machine))
 
                 # Order exploits according to their type