Further merge fixes