Mixins bug fixes