fixes to support mixins