fix basic validations