Minor fixup of owner -> contact for recent merges