More fixes to work with 2.1.x version of spree.