diff --git a/gen/plone25/templates/ArchetypesTemplate.py b/gen/plone25/templates/ArchetypesTemplate.py
index a7bb780..493410e 100755
--- a/gen/plone25/templates/ArchetypesTemplate.py
+++ b/gen/plone25/templates/ArchetypesTemplate.py
@@ -29,6 +29,8 @@ class <!genClassName!>(<!parents!>):
     i18nDomain = '<!applicationName!>'
     schema = fullSchema
     wrapperClass = <!genClassName!>_Wrapper
+    for elem in dir(ClassMixin):
+        if not elem.startswith('__'): security.declarePublic(elem)
 <!commonMethods!>
 <!methods!>
 <!register!>
diff --git a/gen/plone25/templates/FlavourTemplate.py b/gen/plone25/templates/FlavourTemplate.py
index 4d1ec10..4f5ddac 100755
--- a/gen/plone25/templates/FlavourTemplate.py
+++ b/gen/plone25/templates/FlavourTemplate.py
@@ -32,6 +32,8 @@ class <!flavourName!>(OrderedBaseFolder, FlavourMixin):
     allMetaTypes = <!metaTypes!>
     wrapperClass = <!wrapperClass!>
     _at_rename_after_creation = True
+    for elem in dir(FlavourMixin):
+        if not elem.startswith('__'): security.declarePublic(elem)
 <!commonMethods!>
 <!predefinedMethods!>
 <!methods!>
diff --git a/gen/plone25/templates/PodTemplate.py b/gen/plone25/templates/PodTemplate.py
index df76f4c..e732289 100755
--- a/gen/plone25/templates/PodTemplate.py
+++ b/gen/plone25/templates/PodTemplate.py
@@ -29,6 +29,8 @@ class <!applicationName!>PodTemplate(BaseContent, PodTemplateMixin):
     _at_rename_after_creation = True
     wrapperClass = <!wrapperClass!>
     schema = fullSchema
+    for elem in dir(PodTemplateMixin):
+        if not elem.startswith('__'): security.declarePublic(elem)
 <!commonMethods!>
 <!methods!>
 registerType(<!applicationName!>PodTemplate, '<!applicationName!>')
diff --git a/gen/plone25/templates/ToolTemplate.py b/gen/plone25/templates/ToolTemplate.py
index 28fa7ae..45ae8f2 100755
--- a/gen/plone25/templates/ToolTemplate.py
+++ b/gen/plone25/templates/ToolTemplate.py
@@ -38,6 +38,8 @@ class <!toolName!>(UniqueObject, OrderedBaseFolder, ToolMixin):
     # When browsing into the tool, the 'configure' portlet should be dislayed.
     left_slots = ['here/portlet_prefs/macros/portlet']
     right_slots = []
+    for elem in dir(ToolMixin):
+        if not elem.startswith('__'): security.declarePublic(elem)
 
     # Tool constructor has no id argument, the id is fixed.
     def __init__(self, id=None):
diff --git a/pod/buffers.py b/pod/buffers.py
index ecc25f5..ab3ba23 100755
--- a/pod/buffers.py
+++ b/pod/buffers.py
@@ -177,7 +177,7 @@ class MemoryBuffer(Buffer):
     actionRex = re.compile('(?:(\w+)\s*\:\s*)?do\s+(\w+)(-)?' \
                            '(?:\s+(for|if|else|with)\s*(.*))?')
     forRex = re.compile('\s*([\w\-_]+)\s+in\s+(.*)')
-    varRex = re.compile('\s*([\w\-_]+)\s+=\s+(.*)')
+    varRex = re.compile('\s*([\w\-_]+)\s*=\s*(.*)')
     def __init__(self, env, parent):
         Buffer.__init__(self, env, parent)
         self.content = u''