Latest round of changes to correspond to spree pull request