Updated Coverage and one error fix