Typo Fixes and Mixin Changes