Fixed up mixin a bit