Attempt to fix some of the cobertura errors.