Fixes and improvements to Server, Overlay

Tidying up some loose ends.
I didn't change it