Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.248.2.1 -r1.248.2.2
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	12 Aug 2015 15:40:07 -0000	1.248.2.1
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	18 Aug 2015 10:42:47 -0000	1.248.2.2
@@ -506,7 +506,9 @@
     # some hypothetical html-checker quiet.
     #
     if {[my exists disabled] && [my exists transmit_field_always]} {
-      ::html::input [list type hidden name [my name] value [my set value]] {}
+      ::html::div {
+        ::html::input [list type hidden name [my name] value [my set value]] {}
+      }
     }
     my set __rendered 1
   }
@@ -551,7 +553,7 @@
     if {$text ne ""} {
       html::div -class [my form_help_text_CSSclass] {
         html::img -src "/shared/images/info.gif" -alt {[i]} -title {Help text} \
-            -width "12" -height 9 -border 0 -style "margin-right: 5px" {}
+            -width "12" -height 9 -style "margin-right: 5px" {}
         html::t $text
       }
     }
@@ -947,7 +949,9 @@
 
     ::html::t " "
     set id __old_value_[my name]
-    ::html::input -type hidden -name $id -id $id -value $value
+    ::html::div {
+      ::html::input -type hidden -name $id -id $id -value $value
+    }
     ::html::span -class file-control -id __a$id {
       ::html::a -href $href {::html::t [my label_or_value $fn] }
 
@@ -1039,6 +1043,7 @@
     my set widget_type text(hidden)
     # remove mixins in case of retyping
     my mixin ""
+    if {[my exists size]} {my unset size}
   }
   hidden instproc render_item {} {
     # don't render the labels
@@ -2428,7 +2433,7 @@
         lappend atts value $rep
         #my msg "lsearch {[my value]} $rep ==> [lsearch [my value] $rep]"
         if {$rep in [my value]} {
-          lappend atts selected on
+          lappend atts selected selected
         }
         ::html::option $atts {::html::t $label}
         ::html::t \n
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.327.2.1 -r1.327.2.2
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Aug 2015 08:55:04 -0000	1.327.2.1
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	18 Aug 2015 10:42:47 -0000	1.327.2.2
@@ -917,10 +917,11 @@
     # prepend some fields above the HTML contents of the form
     #
     $rootNode insertBeforeFromScript {
-      ::html::input -type hidden -name __object_name -value [my name]
-      ::html::input -type hidden -name __form_action -value save-form-data
-      ::html::input -type hidden -name __current_revision_id -value [my revision_id]
-
+      ::html::div {
+        ::html::input -type hidden -name __object_name -value [my name]
+        ::html::input -type hidden -name __form_action -value save-form-data
+        ::html::input -type hidden -name __current_revision_id -value [my revision_id]
+      }
       # insert automatic form fields on top 
       foreach att $field_names {
         #if {$formgiven && ![string match _* $att]} continue
@@ -1461,7 +1462,8 @@
       if {![my exists description]} {my set description [my get_description $content]}
 
       if {[info commands ::template::head::add_meta] ne ""} {
-        set meta(language) [my lang]
+        #set meta(language) [my lang]
+        ::xo::Page set_property doc title [my lang]
         set meta(description) [my description]
         set meta(keywords) ""
         if {[my istype ::xowiki::FormPage]} {