Grafting in 1.3 fixes

For shiptos