some updates for spree 2.0 compliance