Finish validator fixes