Several changes according to Changes.md