Fix imports and mixins