Fixup for Spree 2.0