Spree 2.2 fixes

Some minor fixes for Spree 2.2.