Fixes and widget changes.