Minor cleanups in widgets

TBR