Minimal improvements in common mixins