Fix some holes exposed by coverage report.