Coverage tweaks