More recipient fixes