More coverage improvements