More recipient fixes.