Fixing more shipto issues