Fix mixin declarations