Fixes and improvements to Server, Overlay

Tidying up some loose ends.
Not tempted to refresh with C++11 variadic templates?