diff --git a/core/lib/Thelia/Admin/Controller/BaseAdminController.php b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
index deca35d33..eaee6ee39 100644
--- a/core/lib/Thelia/Admin/Controller/BaseAdminController.php
+++ b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
@@ -45,7 +45,7 @@ class BaseAdminController
 
         $this->parser = $parser;
 
-        // FIXME: should be red from config
+        // FIXME: should be read from config
         $this->parser->setTemplate('admin/default');
     }
 
diff --git a/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterParserPluginPass.php b/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterParserPluginPass.php
index eeef6a09b..3c1d0f35f 100644
--- a/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterParserPluginPass.php
+++ b/core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterParserPluginPass.php
@@ -32,7 +32,6 @@ use Symfony\Component\DependencyInjection\Reference;
  * Register parser plugins. These plugins shouild be tagged thelia.parser.register_plugin
  * in the configuration.
  *
- * @author Franck Allimant <franck@cqfdev.fr>
  *
  */
 class RegisterParserPluginPass implements CompilerPassInterface {
diff --git a/core/lib/Thelia/Tpex b/core/lib/Thelia/Tpex
index 8561f3516..b1c517281 160000
--- a/core/lib/Thelia/Tpex
+++ b/core/lib/Thelia/Tpex
@@ -1 +1 @@
-Subproject commit 8561f3516ea03a20e397c4c3aba530fbc6adc364
+Subproject commit b1c517281eb3c9b50260b0cf2b5e41ffa94808e0
diff --git a/web/.htaccess b/web/.htaccess
index 1c2d2bbe7..4336ad269 100755
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -8,7 +8,5 @@ AddDefaultCharset UTF-8
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
 
-	RewriteBase /thelia2
-
 	RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
 </IfModule>
\ No newline at end of file