Minor mixin fixes
Updated dependencies