Further merge corrections