Tiny fixes to server