Gifting fixes