Little changes in core classes.