diff --git a/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml
index 4c21b104799..95a668f0449 100644
--- a/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/AdminApiBundle/Resources/config/services/controller.xml
@@ -13,17 +13,17 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.controller.show_available_payment_methods" class="Sylius\Bundle\AdminApiBundle\Controller\ShowAvailablePaymentMethodsController">
+        <service id="sylius.controller.show_available_payment_methods" class="Sylius\Bundle\AdminApiBundle\Controller\ShowAvailablePaymentMethodsController" public="true">
             <argument type="service" id="sm.factory" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius.payment_methods_resolver" />
             <argument type="service" id="fos_rest.view_handler" />
         </service>
-        <service id="sylius.controller.update_product_taxon_position" class="Sylius\Bundle\AdminApiBundle\Controller\ProductTaxonPositionController">
+        <service id="sylius.controller.update_product_taxon_position" class="Sylius\Bundle\AdminApiBundle\Controller\ProductTaxonPositionController" public="true">
             <argument type="service" id="sylius.repository.product_taxon" />
             <argument type="service" id="doctrine.orm.entity_manager" />
         </service>
-        <service id="sylius.controller.show_available_shipping_methods" class="Sylius\Bundle\AdminApiBundle\Controller\ShowAvailableShippingMethodsController">
+        <service id="sylius.controller.show_available_shipping_methods" class="Sylius\Bundle\AdminApiBundle\Controller\ShowAvailableShippingMethodsController" public="true">
             <argument type="service" id="sm.factory" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius.shipping_methods_resolver" />
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/customer.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/customer.yml
index fca4346a0e2..403e83231c5 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/customer.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/customer.yml
@@ -10,7 +10,7 @@ sylius_admin_partial_customer_latest:
             repository:
                 method: findLatest
                 arguments:
-                    - !!int $count
+                    - '!!int $count'
             template: $template
             permission: true
 
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/order.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/order.yml
index de1e2af9ba4..eb111e4e176 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/order.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/partial/order.yml
@@ -7,7 +7,7 @@ sylius_admin_partial_order_latest:
             repository:
                 method: findLatest
                 arguments:
-                    - !!int $count
+                    - '!!int $count'
             template: $template
             permission: true
 
@@ -20,7 +20,7 @@ sylius_admin_partial_order_latest_in_channel:
             repository:
                 method: findLatestInChannel
                 arguments:
-                    count: !!int $count
+                    count: '!!int $count'
                     channel: expr:notFoundOnNull(service('sylius.repository.channel').findOneByCode($channelCode))
             template: $template
             permission: true
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml
index 4f4c58153fc..bc6584f1bb4 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/controller.xml
@@ -17,20 +17,20 @@
     </parameters>
 
     <services>
-        <service id="sylius.controller.admin.dashboard" class="Sylius\Bundle\AdminBundle\Controller\DashboardController">
+        <service id="sylius.controller.admin.dashboard" class="Sylius\Bundle\AdminBundle\Controller\DashboardController" public="true">
             <argument type="service" id="sylius.dashboard.statistics_provider" />
             <argument type="service" id="sylius.repository.channel" />
             <argument type="service" id="templating" />
             <argument type="service" id="router" />
         </service>
 
-        <service id="sylius.controller.customer_statistics" class="Sylius\Bundle\AdminBundle\Controller\CustomerStatisticsController">
+        <service id="sylius.controller.customer_statistics" class="Sylius\Bundle\AdminBundle\Controller\CustomerStatisticsController" public="true">
             <argument type='service' id="sylius.customer_statistics_provider" />
             <argument type='service' id="sylius.repository.customer" />
             <argument type='service' id="templating" />
         </service>
 
-        <service id="sylius.controller.admin.notification" class="Sylius\Bundle\AdminBundle\Controller\NotificationController">
+        <service id="sylius.controller.admin.notification" class="Sylius\Bundle\AdminBundle\Controller\NotificationController" public="true">
             <argument type="service" id="sylius.http_client" />
             <argument type="service" id="sylius.http_message_factory" />
             <argument type="string">%sylius.admin.notification.uri%</argument>
diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
index 10487a40986..e133eec83cc 100644
--- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/controller.xml
@@ -4,7 +4,7 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.controller.payum" class="Sylius\Bundle\PayumBundle\Controller\PayumController">
+        <service id="sylius.controller.payum" class="Sylius\Bundle\PayumBundle\Controller\PayumController" public="true">
             <argument type="service" id="payum" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="expression">service('sylius.resource_registry').get('sylius.order')</argument>
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product.yml
index 9db68c8b942..1179adba606 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product.yml
@@ -13,7 +13,7 @@ sylius_shop_partial_product_index_latest:
                 arguments:
                     - "expr:service('sylius.context.channel').getChannel()"
                     - "expr:service('sylius.context.locale').getLocaleCode()"
-                    - !!int $count
+                    - '!!int $count'
 
 sylius_shop_partial_product_show_by_slug:
     path: /{slug}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product_review.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product_review.yml
index 8b8d5f8314c..01f4e6f2248 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product_review.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/routing/partial/product_review.yml
@@ -12,5 +12,5 @@ sylius_shop_partial_product_review_latest:
                 method: findLatestByProductId
                 arguments:
                     - $productId
-                    - !!int $count
+                    - '!!int $count'
         count: 3
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
index b59d6ed2553..bd453aa41e4 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/controller.xml
@@ -13,7 +13,7 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.controller.shop.contact" class="Sylius\Bundle\ShopBundle\Controller\ContactController">
+        <service id="sylius.controller.shop.contact" class="Sylius\Bundle\ShopBundle\Controller\ContactController" public="true">
             <argument type="service" id="router" />
             <argument type="service" id="form.factory" />
             <argument type="service" id="templating" />
@@ -22,25 +22,25 @@
             <argument type="service" id="sylius.email_manager.contact" />
         </service>
 
-        <service id="sylius.controller.shop.homepage" class="Sylius\Bundle\ShopBundle\Controller\HomepageController">
+        <service id="sylius.controller.shop.homepage" class="Sylius\Bundle\ShopBundle\Controller\HomepageController" public="true">
             <argument type="service" id="templating" />
         </service>
 
-        <service id="sylius.controller.shop.currency_switch" class="Sylius\Bundle\ShopBundle\Controller\CurrencySwitchController">
+        <service id="sylius.controller.shop.currency_switch" class="Sylius\Bundle\ShopBundle\Controller\CurrencySwitchController" public="true">
             <argument type="service" id="templating" />
             <argument type="service" id="sylius.context.currency" />
             <argument type="service" id="sylius.storage.currency" />
             <argument type="service" id="sylius.context.channel" />
         </service>
 
-        <service id="sylius.controller.shop.locale_switch" class="Sylius\Bundle\ShopBundle\Controller\LocaleSwitchController">
+        <service id="sylius.controller.shop.locale_switch" class="Sylius\Bundle\ShopBundle\Controller\LocaleSwitchController" public="true">
             <argument type="service" id="templating" />
             <argument type="service" id="sylius.context.locale" />
             <argument type="service" id="sylius.locale_provider" />
             <argument type="service" id="sylius.shop.locale_switcher" />
         </service>
 
-        <service id="sylius.controller.shop.security_widget" class="Sylius\Bundle\ShopBundle\Controller\SecurityWidgetController">
+        <service id="sylius.controller.shop.security_widget" class="Sylius\Bundle\ShopBundle\Controller\SecurityWidgetController" public="true">
             <argument type="service" id="templating" />
         </service>
     </services>
diff --git a/src/Sylius/Bundle/UiBundle/Resources/config/services/controller.xml b/src/Sylius/Bundle/UiBundle/Resources/config/services/controller.xml
index 9e7e74ae009..5baa0afdd32 100644
--- a/src/Sylius/Bundle/UiBundle/Resources/config/services/controller.xml
+++ b/src/Sylius/Bundle/UiBundle/Resources/config/services/controller.xml
@@ -13,7 +13,7 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.controller.security" class="Sylius\Bundle\UiBundle\Controller\SecurityController">
+        <service id="sylius.controller.security" class="Sylius\Bundle\UiBundle\Controller\SecurityController" public="true">
             <argument type="service" id="security.authentication_utils" />
             <argument type="service" id="form.factory" />
             <argument type="service" id="templating" />
diff --git a/src/Sylius/Bundle/UserBundle/Resources/translations/messages.es.yml b/src/Sylius/Bundle/UserBundle/Resources/translations/messages.es.yml
index 5377fd89caf..8bff648a38a 100644
--- a/src/Sylius/Bundle/UserBundle/Resources/translations/messages.es.yml
+++ b/src/Sylius/Bundle/UserBundle/Resources/translations/messages.es.yml
@@ -7,7 +7,6 @@ sylius:
             email: Dirección de correo electrónico
             enabled: '¿Activado?'
             password:
-                label: Contraseña de API
                 confirmation: Confirmar contraseña
             remember_me: Recordarme
             shipping_address: Dirección de envío