Small fixes to restore coverage count.