Small code fixes in some classes.