Some coverage improvements