Fixes in flavour of Rails 4, spree 2.3.x