Fix recipient and destination copy and paste bugs CORE-12137