Fix the widget definition XML and related model.