Minor tweaks to server