Minor changes to mixins