Adapt some changes