More changes trying to keep track of upstream