Even more validator fixes.