Fixes for saving shipto information

--HG--
extra : source : 9f3bf3a85d67b770aac5ce5228ca3d8b3f472ea4