Small changes in some utility classes.