Making some more changes affecting how different versions are dealt with.