Fixed related handling on mixins