Adjust to changes in master