Tweaks to client/server