Other small fixes to widgets