More changes towards the release

Changes are described in the first commit message.