Fixes and improvements to Server, Overlay

Tidying up some loose ends.
Would be good to log the reason for being too busy.