fixing errors in mixins