Several server improvements