Fixes, validations