various validator fixes all over the place.