Couple tweaks to improve server mode