Fixed problems in mixins.