Small changes in several classes.