+ fix mixin aliases