Fixes in validations