Widgets more self-contained fixes