Server: Small corrections