Couple tweaks to increase coverage