Some spree 2.2.x changes.