Fixed utils classes.