Fixes for Spree 2.0.x compatibility (kind of)