Tweaks for server mode