More coverage tweaks