fixes for spree 2.1.3 and rails 4