Small changes in some classes. Nothing important to report!