Changed files to be compatibel with spree-2.2.1