Some changes in several files.