Added autocoverage tweaks.