diff --git a/core/lib/Thelia/Admin/Controller/BaseAdminController.php b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
index 5a4020561..7c66c430b 100755
--- a/core/lib/Thelia/Admin/Controller/BaseAdminController.php
+++ b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
@@ -83,7 +83,7 @@ class BaseAdminController extends ContainerAware
         catch (AuthenticationTokenNotFoundException $ex) {
 
 			// No auth token -> perform login
-        	return new RedirectResponse($this->generateUrl('/admin/login'));
+        	return new RedirectResponse($this->generateUrl('admin/login'));
         }
 
         return $data;
@@ -134,7 +134,7 @@ class BaseAdminController extends ContainerAware
      */
     public function generateUrl($route, $parameters = array(), $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
     {
-    	return "$route";
+    	return "thelia2/$route";
 
     	//return $this->container->get('router')->generate($route, $parameters, $referenceType);
     }
diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index 2d427d6b7..acef5a27d 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -55,7 +55,7 @@ class Product extends BaseLoop
     /**
      * @return ArgumentCollection
      */
-    protected function defineArgs()
+    protected function getArgDefinitions()
     {
         return new ArgumentCollection(
             Argument::createIntListTypeArgument('id'),