Fixes on create_form method