diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index 8ba0fc6..a0ff511 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -69,7 +69,7 @@ Spree::CheckoutController.class_eval do
 
       unless payment_method.preferred_no_shipping
         ship_address = @ppx_details.address
-        order_ship_address = Address.new :firstname  => @ppx_details.params["first_name"],
+        order_ship_address = Spree::Address.new :firstname  => @ppx_details.params["first_name"],
                                          :lastname   => @ppx_details.params["last_name"],
                                          :address1   => ship_address["address1"],
                                          :address2   => ship_address["address2"],
diff --git a/lib/spree_paypal_express/engine.rb b/lib/spree_paypal_express/engine.rb
index fdb5f26..d50212b 100644
--- a/lib/spree_paypal_express/engine.rb
+++ b/lib/spree_paypal_express/engine.rb
@@ -22,6 +22,10 @@ module SpreePaypalExpress
       ]
     end
 
+    ActiveSupport::Inflector.inflections do |inflect|
+      inflect.singular 'express', 'express'
+    end
+
     config.to_prepare &method(:activate).to_proc
   end
 end