Some hacks into the Widgets for #39