Update to latest mixins
Tweaks