Fixes for the createGift functionality