Fix minor bugs in mixins.