Update to 2.2.1 versions
Mixin to work around activate issue