More coverage style tweaks