Fixes for saving shipto information