Port fixes for mixins.