Small changes for Spree 2.1 compatability