improvements from spree 2.2