Only minor changes in several classes