Fixup widget base

Merged Wout De Nolf requested to merge fixup_widget_base into main

Merge request reports