More changes in prep for release