Fix mixins for new functions