fixes to work with spree 1.3