Better mixins and minor fixes