mixin fixes