Gift edit fixes
Merge, apparently