Fixups after merge