fixes for spree 2.3