Tweaks to server