diff --git a/fop-core/src/main/java/org/apache/fop/afp/AFPResourceManager.java b/fop-core/src/main/java/org/apache/fop/afp/AFPResourceManager.java
index 459f0e9..f041999 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/AFPResourceManager.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/AFPResourceManager.java
@@ -120,10 +120,20 @@ public class AFPResourceManager {
     }
 
     /**
+     * Tells the streamer to close
+     *
+     * @throws IOException thrown if an I/O exception of some sort has occurred.
+     */
+    public void closeStream() throws IOException {
+        streamer.close();
+    }
+    
+    /**
      * Tells the streamer to write
      *
      * @throws IOException thrown if an I/O exception of some sort has occurred.
      */
+    @Deprecated
     public void writeToStream() throws IOException {
         streamer.close();
     }
diff --git a/fop-core/src/main/java/org/apache/fop/fo/properties/TableBorderPrecedence.java b/fop-core/src/main/java/org/apache/fop/fo/properties/TableBorderPrecedence.java
index b01ee22..50cabd1 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/properties/TableBorderPrecedence.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/properties/TableBorderPrecedence.java
@@ -50,6 +50,34 @@ public class TableBorderPrecedence extends NumberProperty.Maker {
      *
      * {@inheritDoc}
      */
+    public Property find(PropertyList propertyList) throws PropertyException {
+        FObj fo = propertyList.getFObj();
+        switch (fo.getNameId()) {
+        case Constants.FO_TABLE:
+            return num6;
+        case Constants.FO_TABLE_CELL:
+            return num5;
+        case Constants.FO_TABLE_COLUMN:
+            return num4;
+        case Constants.FO_TABLE_ROW:
+            return num3;
+        case Constants.FO_TABLE_BODY:
+            return num2;
+        case Constants.FO_TABLE_HEADER:
+            return num1;
+        case Constants.FO_TABLE_FOOTER:
+            return num0;
+        default:
+            return null;
+        }
+    }
+    
+    /**
+     * Set default precedence according to the parent FObj
+     *
+     * {@inheritDoc}
+     */
+    @Deprecated
     public Property make(PropertyList propertyList) throws PropertyException {
         FObj fo = propertyList.getFObj();
         switch (fo.getNameId()) {
diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java b/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java
index 56a483f..a250465 100644
--- a/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java
@@ -65,6 +65,20 @@ public class AFPIncludeFormMap extends AFPExtensionAttachment {
     }
 
     /** {@inheritDoc} */
+    public void addSAX(ContentHandler handler) throws SAXException {
+        AttributesImpl atts = new AttributesImpl();
+        if (name != null && name.length() > 0) {
+            atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
+        }
+        if (this.src != null) {
+            atts.addAttribute("", ATT_SRC, ATT_SRC, "CDATA", this.src.toASCIIString());
+        }
+        handler.startElement(CATEGORY, elementName, elementName, atts);
+        handler.endElement(CATEGORY, elementName, elementName);
+    }
+    
+    /** {@inheritDoc} */
+    @Deprecated
     public void toSAX(ContentHandler handler) throws SAXException {
         AttributesImpl atts = new AttributesImpl();
         if (name != null && name.length() > 0) {
diff --git a/fop-events/src/main/java/org/apache/fop/events/Event.java b/fop-events/src/main/java/org/apache/fop/events/Event.java
index 7c5759e..9c04b46 100644
--- a/fop-events/src/main/java/org/apache/fop/events/Event.java
+++ b/fop-events/src/main/java/org/apache/fop/events/Event.java
@@ -182,6 +182,15 @@ public class Event extends EventObject {
          * Returns the accumulated parameter map.
          * @return the accumulated parameter map
          */
+        public Map<String, Object> getParams() {
+            return this.params;
+        }
+        
+        /**
+         * Returns the accumulated parameter map.
+         * @return the accumulated parameter map
+         */
+        @Deprecated
         public Map<String, Object> build() {
             return this.params;
         }