More fixes for widget