diff --git a/core/pom.xml b/core/pom.xml
index a2013ab2e..172a26d55 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -226,6 +226,25 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>default-tools.jar</id>
+            <activation>
+                <property>
+                    <name>java.vendor</name>
+                    <value>Sun Microsystems Inc.</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.sun</groupId>
+                    <artifactId>tools</artifactId>
+                    <version>1.5.0</version>
+                    <scope>system</scope>
+                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
+
     </profiles>
  
     
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
index baadef4ea..e46d556c0 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DivDirective.java
@@ -39,4 +39,8 @@ public class DivDirective extends AbstractDirective {
     protected Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Div(stack, req, res);
     }
+
+    public int getType() {
+        return BLOCK;
+    }
 }
diff --git a/core/src/main/resources/META-INF/struts-tags.tld b/core/src/main/resources/META-INF/struts-tags.tld
index a924041f2..b47bd553a 100644
--- a/core/src/main/resources/META-INF/struts-tags.tld
+++ b/core/src/main/resources/META-INF/struts-tags.tld
@@ -2762,7 +2762,7 @@
       <name>doubleListKey</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The key expression to use for second list]]></description>
+      <description><![CDATA[Set the list key of the second attribute]]></description>
     </attribute>
     <attribute>
       <name>doubleListValue</name>
@@ -4958,7 +4958,7 @@
       <name>doubleListKey</name>
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
-      <description><![CDATA[The key expression to use for second list]]></description>
+      <description><![CDATA[Set the list key of the second attribute]]></description>
     </attribute>
     <attribute>
       <name>doubleListValue</name>
diff --git a/core/src/site/resources/tags/doubleselect.html b/core/src/site/resources/tags/doubleselect.html
index 3c156d9e7..807e6bf59 100644
--- a/core/src/site/resources/tags/doubleselect.html
+++ b/core/src/site/resources/tags/doubleselect.html
@@ -137,7 +137,7 @@ Please do not edit it directly.
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The key expression to use for second list</td>
+					<td align="left" valign="top">Set the list key of the second attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">doubleListValue</td>
diff --git a/core/src/site/resources/tags/optiontransferselect.html b/core/src/site/resources/tags/optiontransferselect.html
index c9a9221b9..5dfa2ea31 100644
--- a/core/src/site/resources/tags/optiontransferselect.html
+++ b/core/src/site/resources/tags/optiontransferselect.html
@@ -241,7 +241,7 @@ Please do not edit it directly.
 					<td align="left" valign="top"></td>
 					<td align="left" valign="top">true</td>
 					<td align="left" valign="top">String</td>
-					<td align="left" valign="top">The key expression to use for second list</td>
+					<td align="left" valign="top">Set the list key of the second attribute</td>
 				</tr>
 				<tr>
 					<td align="left" valign="top">doubleListValue</td>