Fixed issues with gifting