Changes to make it compatible with Spree 2-2-stable