diff --git a/src/ptvsd/__main__.py b/src/ptvsd/__main__.py
index e25cbe71..ef5984cc 100644
--- a/src/ptvsd/__main__.py
+++ b/src/ptvsd/__main__.py
@@ -369,7 +369,7 @@ else:
 
 
 def main(argv=sys.argv):
-    saved_argv = argv
+    saved_argv = list(argv)
     try:
         sys.argv[:] = [argv[0]] + list(parse(argv[1:]))
     except Exception as ex:
diff --git a/src/ptvsd/_vendored/pydevd/pydevd.py b/src/ptvsd/_vendored/pydevd/pydevd.py
index 803f7071..5c1d0e7a 100644
--- a/src/ptvsd/_vendored/pydevd/pydevd.py
+++ b/src/ptvsd/_vendored/pydevd/pydevd.py
@@ -1596,8 +1596,17 @@ class PyDB(object):
         return globals
 
     def exiting(self):
-        sys.stdout.flush()
-        sys.stderr.flush()
+        # Either or both standard streams can be closed at this point,
+        # in which case flush() will fail.
+        try:
+            sys.stdout.flush()
+        except:
+            pass
+        try:
+            sys.stderr.flush()
+        except:
+            pass
+
         self.check_output_redirect()
         cmd = self.cmd_factory.make_exit_message()
         self.writer.add_command(cmd)
diff --git a/src/ptvsd/multiproc.py b/src/ptvsd/multiproc.py
index 05fa3ce2..30859ba8 100644
--- a/src/ptvsd/multiproc.py
+++ b/src/ptvsd/multiproc.py
@@ -74,12 +74,18 @@ def listen_for_subprocesses():
     assert subprocess_listener_socket is None
 
     subprocess_listener_socket = create_server('localhost', 0)
+    ptvsd.log.debug(
+        'Listening for subprocess notifications on port {0}.',
+        subprocess_listener_port())
+
     atexit.register(stop_listening_for_subprocesses)
     atexit.register(kill_subprocesses)
     new_hidden_thread('SubprocessListener', _subprocess_listener).start()
 
 
 def stop_listening_for_subprocesses():
+    ptvsd.log.debug('Stopping listening for subprocess notifications.')
+
     global subprocess_listener_socket
     if subprocess_listener_socket is None:
         return
@@ -93,13 +99,17 @@ def stop_listening_for_subprocesses():
 def kill_subprocesses():
     with subprocess_lock:
         pids = list(subprocesses.keys())
+
+    ptvsd.log.debug('Killing remaining subprocesses: PID={0}', pids)
+
     for pid in pids:
+        ptvsd.log.debug('Killing subprocess with PID={0}.', pid)
         with subprocess_lock:
             subprocesses.pop(pid, None)
         try:
             os.kill(pid, signal.SIGTERM)
         except Exception:
-            pass
+            ptvsd.log.exception('Failed to kill process with PID={0}.', pid, category='D')
 
 
 def subprocess_listener_port():
@@ -116,8 +126,13 @@ def _subprocess_listener():
             (sock, _) = subprocess_listener_socket.accept()
         except Exception:
             break
-        stream = JsonIOStream.from_socket(sock)
-        _handle_subprocess(next(counter), stream)
+
+        n = next(counter)
+        name = 'subprocess-{}'.format(n)
+        ptvsd.log.debug('Accepted incoming connection from {0}', name)
+
+        stream = JsonIOStream.from_socket(sock, name=name)
+        _handle_subprocess(n, stream)
 
 
 def _handle_subprocess(n, stream):
@@ -138,13 +153,18 @@ def _handle_subprocess(n, stream):
             with subprocess_lock:
                 subprocesses[self._pid] = channel
 
-            ptvsd.log.debug('ptvsd_subprocess: {0!r}', arguments)
+            ptvsd.log.debug(
+                'Subprocess {0} (PID={1}) registered, notifying IDE.',
+                stream.name,
+                self._pid)
+
             response = {'incomingConnection': False}
             subprocess_queue.put((arguments, response))
             subprocess_queue.join()
             return response
 
         def disconnect(self):
+            ptvsd.log.debug('Subprocess {0} disconnected, presumed to have terminated.', self._pid)
             if self._pid is not None:
                 with subprocess_lock:
                     subprocesses.pop(self._pid, None)
@@ -157,7 +177,7 @@ def _handle_subprocess(n, stream):
 def notify_root(port):
     assert options.subprocess_of
 
-    ptvsd.log.debug('Subprocess {0} notifying root process at port {1}', os.getpid(), options.subprocess_notify)
+    ptvsd.log.debug('Subprocess (PID={0}) notifying root process at port {1}', os.getpid(), options.subprocess_notify)
     conn = create_client()
     conn.connect(('localhost', options.subprocess_notify))
     stream = JsonIOStream.from_socket(conn, 'root-process')