fixes for spree 2.2