Fixes from Widget-Adapters library.