Further adjustments to get back 100% mutcov