Fixed stack versions
Put back validations