Merge some corrections