Fix make_field, make_widget behavior