Typo and Mixin fixes