Fixing more shipto issues

fixes bug 1199