BUGFIX: various

git-svn-id: https://silverstripe-ecommerce.googlecode.com/svn/modules/ecommerce_delivery/trunk@4531 950b781c-c544-efab-2f99-90083ee69683