Fixes for Spree 2.0 final.