Tweaks to issure that coverage is properly configured