Gavi is back in the fold after illness but also one yellow card away from a suspension