Fixed bugs post wtf upgrade around validators