Fix up after merge