Fix compatibility with latest Spree stable release