4 files changed, 6 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index a6be832f0..c9c04aa4e 100644
--- a/src/java/org/apache/fop/fo/FONode.java
+++ b/src/java/org/apache/fop/fo/FONode.java
@@ -69,7 +69,7 @@ public abstract class FONode implements Cloneable {
     protected Locator locator;
 
     /** Logger for fo-tree related messages **/
-    protected static Log log = LogFactory.getLog(FONode.class);
+    protected static final Log log = LogFactory.getLog(FONode.class);
 
     /**
      * Base constructor
diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 5db11f731..c78421cbe 100644
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -619,7 +619,7 @@ public class FOText extends FONode implements CharSequence {
     }
 
     /** @return the baseline-shift property */
-    public Length getBaseLineShift() {
+    public Length getBaselineShift() {
         return baselineShift;
     }
 
diff --git a/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java b/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
index 224741294..6dcc31385 100644
--- a/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
+++ b/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java
@@ -33,6 +33,8 @@ import org.xml.sax.SAXException;
  */
 public class XMPMetadata implements ExtensionAttachment, Serializable, XMLizable {
 
+    private static final long serialVersionUID = 591347206217931578L;
+
     /** The category URI for this extension attachment. */
     public static final String CATEGORY = XMPConstants.XMP_NAMESPACE;
 
diff --git a/src/java/org/apache/fop/fo/properties/Property.java b/src/java/org/apache/fop/fo/properties/Property.java
index 29e8faac5..a04f96a3c 100644
--- a/src/java/org/apache/fop/fo/properties/Property.java
+++ b/src/java/org/apache/fop/fo/properties/Property.java
@@ -36,7 +36,7 @@ import org.apache.fop.fo.Constants;
 public class Property {
 
     /** Logger for all property classes */
-    protected static Log log = LogFactory.getLog(PropertyMaker.class);
+    protected static final Log log = LogFactory.getLog(PropertyMaker.class);
 
     /**
      * The original specified value for properties which inherit
@@ -197,6 +197,6 @@ public class Property {
         if (obj != this) {
             return obj.toString();
         }
-        return null;
+        return "";
     }
 }