diff --git a/browser/common.py b/browser/common.py
old mode 100644
new mode 100755
index 3d51959..6a977dd
--- a/browser/common.py
+++ b/browser/common.py
@@ -712,8 +712,11 @@ class BaseView(GenericView, I18NView):
         if IResource.providedBy(self.target):
             statesDefs = self.globalOptions('organize.stateful.resource', ())
         else:
+            typeOptions = self.typeOptions('organize.stateful')
+            if typeOptions is None:
+                typeOptions = []
             statesDefs = (self.globalOptions('organize.stateful.concept', []) +
-                          self.typeOptions('organize.stateful', []))
+                          typeOptions)
         for std in statesDefs:
             stf = component.getAdapter(self.target, IStateful, name=std)
             result.append(stf)
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
old mode 100644
new mode 100755
index 110280e..ccf274c
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -265,7 +265,7 @@
           <label style="display: inline"
                  for="version.create"><span i18n:translate="">
             New version</span></label>
-          <tal:level condition="python: len(view.versionLevels) > 1">:
+          <tal:level condition="python: len(list(view.versionLevels)) > 1">:
             <select name="version.level">
               <option tal:repeat="level view/versionLevels"
                       i18n:translate=""
@@ -278,11 +278,11 @@
 </metal:versioning>
 
 
-<metal:states define-macro="states">
+<metal:states define-macro="states"
+              tal:define="states view/states"
+              tal:condition="states">
     <tr><td colspan="5" i18n:translate="" class="headline">States</td></tr>
-    <metal:states define-macro="states_info"
-                  tal:define="states view/states"
-                  tal:condition="states">
+    <metal:states define-macro="states_info">
       <tr tal:repeat="st states">
         <tal:state define="stObj st/getStateObject;
                            stDef st/statesDefinition;