more fixes to mixins