even more validator fixes