shipto fixes

HG seems to have grabbed too many changes.  Not sure what happened but the code changes look right so committing.