Merge pull request #1944 from ussuri/small-fixes

Minor cleanups in widgets