More changes for next release