Small amendments to server