Server coverage improvements