Yet more ChangeLog merge fixes