Merge some changes