Minor changes in several classes.