Further coverage improvements