more validator fixes