Small widget-related fixes

Auditors: eater, alex