Fixed errors in mixins - had some leftover code from when i fell asleep