More changes from review