fixes for compatibility with spree 1.3.2