diff --git a/src/Controller/Component.php b/src/Controller/Component.php
index 02bdd9f..a7ce660 100644
--- a/src/Controller/Component.php
+++ b/src/Controller/Component.php
@@ -131,7 +131,7 @@ class Component
         $tpl->set('media', Path::join($this->config->get('system', 'templates.web'), $template));
 
         if ($default) {
-            $tpl->set('site_template', $this->config->get('site', 'templates.web') . $default);
+            $tpl->set('site_template', Path::join($this->config->get('site', 'templates.web'), $default));
         }
         $tpl->set('base', $this->config->get('site', 'web'));
 
diff --git a/src/Form/Upload.php b/src/Form/Upload.php
index 3da54f8..7cd38b8 100644
--- a/src/Form/Upload.php
+++ b/src/Form/Upload.php
@@ -3,5 +3,5 @@
 namespace ctiso\Form;
 use ctiso\Form\Field;
 
-class TUpload extends Field {
+class Upload extends Field {
 }