3 files changed, 3 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fonts/FontLoader.java b/src/java/org/apache/fop/fonts/FontLoader.java
index f28efb5ee..96915e097 100644
--- a/src/java/org/apache/fop/fonts/FontLoader.java
+++ b/src/java/org/apache/fop/fonts/FontLoader.java
@@ -105,8 +105,8 @@ public abstract class FontLoader {
             }
             loader = new Type1FontLoader(fontFileURI, embedded, useKerning, resourceResolver);
         } else {
-            loader = new TTFFontLoader(fontFileURI, subFontName,
-                    embedded, embeddingMode, encodingMode, useKerning, useAdvanced, resourceResolver);
+            loader = new TTFFontLoader(fontFileURI, subFontName, embedded, embeddingMode,
+	                        encodingMode, useKerning, useAdvanced, resourceResolver);
         }
         return loader.getFont();
     }
diff --git a/src/java/org/apache/fop/fonts/LazyFont.java b/src/java/org/apache/fop/fonts/LazyFont.java
index 8fb50fd08..4c42387f2 100644
--- a/src/java/org/apache/fop/fonts/LazyFont.java
+++ b/src/java/org/apache/fop/fonts/LazyFont.java
@@ -46,7 +46,7 @@ public class LazyFont extends Typeface implements FontDescriptor, Substitutable,
     private final boolean useKerning;
     private final boolean useAdvanced;
     private final EncodingMode encodingMode;
-    private EmbeddingMode embeddingMode;
+    private final EmbeddingMode embeddingMode;
     private final String subFontName;
     private final boolean embedded;
     private final InternalResourceResolver resourceResolver;
diff --git a/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java b/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
index fb6c89ce4..a0b1e99db 100644
--- a/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
+++ b/src/java/org/apache/fop/render/afp/AFPDocumentHandler.java
@@ -55,7 +55,6 @@ import org.apache.fop.render.afp.extensions.AFPPageSetup;
 import org.apache.fop.render.afp.extensions.ExtensionPlacement;
 import org.apache.fop.render.intermediate.AbstractBinaryWritingIFDocumentHandler;
 import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.render.intermediate.IFDocumentHandler;
 import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator;
 import org.apache.fop.render.intermediate.IFException;
 import org.apache.fop.render.intermediate.IFPainter;