-) Fixed a few more (much more rare) race conditions on shutdown.
-) Fixed a degenerate case if we create a server but never start it.