Fix up simple_form and validations