more fixes for widgets