Updated compatibility mixins, mixins