More validator fixes