Merge some updates