Tweaks for server