more validator fixes :(