diff --git a/mitogen/core.py b/mitogen/core.py
index 6cf5a0b8..af8ab41f 100644
--- a/mitogen/core.py
+++ b/mitogen/core.py
@@ -744,15 +744,18 @@ class Waker(BasicStream):
         Nothing is written if the current thread is the IO multiplexer thread.
         """
         IOLOG.debug('%r.wake() [fd=%r]', self, self.transmit_side.fd)
-        if threading.currentThread() != self._broker._thread and \
-           self.transmit_side.fd:
-            os.write(self.transmit_side.fd, ' ')
+        if threading.currentThread() != self._broker._thread:
+            try:
+                self.transmit_side.write(' ')
+            except OSError, e:
+                if e[0] != errno.EBADF:
+                    raise
 
     def on_receive(self, broker):
         """
         Read a byte from the self-pipe.
         """
-        os.read(self.receive_side.fd, 256)
+        self.receive_side.read(256)
 
 
 class IoLogger(BasicStream):
@@ -1003,6 +1006,7 @@ class Broker(object):
             while self._alive:
                 self._loop_once()
 
+            self._run_defer()
             fire(self, 'shutdown')
 
             for side in self._readers | self._writers: