diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java
index 0e7995654..bdde0a5b9 100644
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java
+++ b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java
@@ -26,7 +26,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSConnectionFactoryDefinition {
     String name();
 
@@ -47,4 +47,8 @@
     int maxPoolSize() default -1;
 
     int minPoolSize() default -1;
+
+    String description() default "";
+
+    String interfaceName() default "";
 }
diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java
index 2c483076c..1b874eddf 100644
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java
+++ b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java
@@ -26,7 +26,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSConnectionFactoryDefinitions {
     JMSConnectionFactoryDefinition[] value();
 }
diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java
index 59c97fcc2..6f8d347b5 100644
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java
+++ b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java
@@ -26,7 +26,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSDestinationDefinition {
     String interfaceName();
 
@@ -39,4 +39,6 @@
     String destinationName() default "";
 
     String[] properties() default {};
+
+    String description() default "";
 }
diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java
index b8cc64113..72f2cce93 100644
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java
+++ b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java
@@ -26,7 +26,7 @@
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSDestinationDefinitions {
-    JMSConnectionFactoryDefinition[] value();
+    JMSDestinationDefinition[] value();
 }
diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSFormatRuntimeException.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSFormatRuntimeException.java
deleted file mode 100644
index 793a65507..000000000
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSFormatRuntimeException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package javax.jms;
-
-public class JMSFormatRuntimeException extends JMSRuntimeException {
-    public JMSFormatRuntimeException(String message) {
-        super(message);
-    }
-
-    public JMSFormatRuntimeException(String message, String errorCode) {
-        super(message, errorCode);
-    }
-
-    public JMSFormatRuntimeException(String message, String errorCode, Throwable cause) {
-        super(message, errorCode, cause);
-    }
-}
diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java
index 0fb7f2bfc..96f951d95 100644
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java
+++ b/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java
@@ -28,7 +28,7 @@
 /**
  * @version $Rev: 467553 $ $Date: 2006-10-25 00:01:51 -0400 (Wed, 25 Oct 2006) $
  */
-public interface MessageConsumer {
+public interface MessageConsumer extends AutoCloseable {
     String getMessageSelector() throws JMSException;
 
     MessageListener getMessageListener() throws JMSException;
diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java
index 47b0c3ada..3623f9458 100644
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java
+++ b/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java
@@ -28,7 +28,7 @@
 /**
  * @version $Rev: 467553 $ $Date: 2006-10-25 00:01:51 -0400 (Wed, 25 Oct 2006) $
  */
-public interface MessageProducer {
+public interface MessageProducer extends AutoCloseable {
     void setDisableMessageID(boolean value) throws JMSException;
 
     boolean getDisableMessageID() throws JMSException;
diff --git a/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java b/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java
index 70d0a8ecf..f4b5860ea 100644
--- a/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java
+++ b/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java
@@ -30,7 +30,7 @@
 /**
  * @version $Rev: 467553 $ $Date: 2006-10-25 00:01:51 -0400 (Wed, 25 Oct 2006) $
  */
-public interface Session extends Runnable {
+public interface Session extends Runnable, AutoCloseable {
     static final int AUTO_ACKNOWLEDGE = 1;
 
     static final int CLIENT_ACKNOWLEDGE = 2;