Additional fixes to work with Spree 2.1