More coverage cleanup