Fix coverage and quality issues.