diff --git a/third_party/kcfinder/core/bootstrap.php b/third_party/kcfinder/core/bootstrap.php
index 3fa35c068e2..dc41eafbdc5 100644
--- a/third_party/kcfinder/core/bootstrap.php
+++ b/third_party/kcfinder/core/bootstrap.php
@@ -108,7 +108,6 @@ function checkLSSession()
     {
         define("BASEPATH", realpath($sLimesurveyFolder . "/../framework") . "/");
     }
-    require_once APPPATH . '../third_party/autoload.php';
     require_once BASEPATH . 'yii.php';
     require_once APPPATH . 'core/LSYii_Application.php';
     $config = require_once(APPPATH . 'config/internal.php');
diff --git a/third_party/yiiext/twig-renderer/ETwigViewRenderer.php b/third_party/yiiext/twig-renderer/ETwigViewRenderer.php
index 9ea8e169493..cf27f725ee8 100644
--- a/third_party/yiiext/twig-renderer/ETwigViewRenderer.php
+++ b/third_party/yiiext/twig-renderer/ETwigViewRenderer.php
@@ -67,8 +67,8 @@ class ETwigViewRenderer extends CApplicationComponent implements IViewRenderer
 
     function init()
     {
-        //require_once Yii::getPathOfAlias($this->twigPathAlias).'/Autoloader.php';
-        //Yii::registerAutoloader(array('Twig_Autoloader', 'autoload'), true);
+        require_once Yii::getPathOfAlias($this->twigPathAlias).'/Autoloader.php';
+        Yii::registerAutoloader(array('Twig_Autoloader', 'autoload'), true);
 
         $app = Yii::app();