Schema: more fixes for widgets.