validation fixes
Pop validations corrected