- Fix some mixin compatibility