Fixes and improvements to Server, Overlay

Tidying up some loose ends.
Does the (void) actually stop a compiler warning?