#372: Fixes for server restart