Mixin minor changes