Tweaks to the server and example