Adjust to GW changes

...