Simple_form fixes