Fix up some widget stuff