Fixes from Widget-Adapters library.
Merge branch 'develop'