Minor mixin fixes