More server coverage improvements