Minor changes in the different classes.