diff --git a/application/config/internal.php b/application/config/internal.php
index acf8769d46d..305944fe6df 100644
--- a/application/config/internal.php
+++ b/application/config/internal.php
@@ -194,11 +194,13 @@
             'fileExtension' => '.twig',
             'options' => array(
                 'autoescape' => true,
+                'debug' => defined('YII_DEBUG') && YII_DEBUG ?true:false,
             ),
             // Those extensions, include the sendbox, will be done later in the process
             'extensions' => array(
                 'Twig_Extension_Sandbox',
                 'Twig_Extension_StringLoader',
+                'Twig_Extension_Debug',
             ),
             'globals' => array(
                 'html' => 'CHtml'
@@ -213,12 +215,12 @@
                 'tags' => array('if', 'for'),
                 'filters' => array('escape', 'raw'),
                 'methods' => array(
-                    'ETwigViewRendererStaticClassProxy'=>array("textfield", "form")
+                    'ETwigViewRendererStaticClassProxy'=>array("textfield", "form", "link", "emailField", "beginForm", "endForm",  )
                 ),
                 'properties' => array(
                     'ETwigViewRendererYiiCoreStaticClassesProxy'=>array("Html")
                 ),
-                'functions' => array()
+                'functions' => array('dump')
             )
 
             // Change template syntax to Smarty-like (not recommended)