More coverage improvements.