- Minor changes in various classes.