More changes from sherbert