more work for spree 2.3.1, avalara 0.0.4, hashie 3.2.0