some fixes for the widget