Noel Connors and Eoin Kelly are both in contention to start for Waterford in Sunday's Munster SHC semi-final against Clare at Semple Stadium.