Fixes and improvements to Server, Overlay

Tidying up some loose ends.
This pattern of checking if p_journal.trace is true before logging is not followed elsewhere.