Fixes to widgets