Fixes
Fix validations