Small changes and fixes in different classes.