Fixes and improvements to Server, Overlay

Tidying up some loose ends.
That's right. If it did that before, then it does it now. I didn't change those things.