diff --git a/src/main/java/ch/sbb/polarion/extension/pdf_exporter/converter/PdfConverter.java b/src/main/java/ch/sbb/polarion/extension/pdf_exporter/converter/PdfConverter.java
index 3f75c28f..9105d366 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf_exporter/converter/PdfConverter.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf_exporter/converter/PdfConverter.java
@@ -278,8 +278,8 @@ String getCssContent(
         String css = pdfStyles
                 + (exportParams.getHeadersColor() != null ?
                 "      h1, h2, h3, h4, h5, h6, .content .title {" +
-                        "        color: " + exportParams.getHeadersColor() + ";" +
-                        "      }"
+                "        color: " + exportParams.getHeadersColor() + ";" +
+                "      }"
                 : "")
                 + listStyles;
 
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/exporter/ModifiedDocumentRenderer.java b/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/exporter/ModifiedDocumentRenderer.java
index 893205f8..77148146 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/exporter/ModifiedDocumentRenderer.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/exporter/ModifiedDocumentRenderer.java
@@ -48,7 +48,6 @@ private ModifiedDocumentRenderer(@NotNull InternalReadOnlyTransaction transactio
         if (lazyLoadParams != null) {
             this.renderingContext.setDocumentLazyLoad(lazyLoadParams.isDocumentLazyLoad());
             this.renderingContext.setCurrentDocumentRevision(lazyLoadParams.getCurrentDocumentRevision());
-            this.renderingContext.setDocumentLazyLoadHeadOrBaseline(lazyLoadParams.isHeadOrBaseline());
         }
 
         FieldRichTextRenderer renderer = null;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/velocity/VelocityEvaluator.java b/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/velocity/VelocityEvaluator.java
index 6a7373a9..8551f179 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/velocity/VelocityEvaluator.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf_exporter/util/velocity/VelocityEvaluator.java
@@ -1,5 +1,6 @@
 package ch.sbb.polarion.extension.pdf_exporter.util.velocity;
 
+import ch.sbb.polarion.extension.generic.util.ObjectUtils;
 import ch.sbb.polarion.extension.pdf_exporter.rest.model.DocumentData;
 import com.polarion.alm.projects.model.IUniqueObject;
 import com.polarion.alm.shared.api.transaction.ReadOnlyTransaction;
@@ -20,14 +21,13 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.StringWriter;
-import java.util.Objects;
 
 public class VelocityEvaluator {
 
     private static final Logger log = Logger.getLogger(VelocityEvaluator.class);
 
     public @NotNull String evaluateVelocityExpressions(@NotNull DocumentData<? extends IUniqueObject> documentData, @NotNull String template) {
-        return Objects.requireNonNull(TransactionalExecutor.executeSafelyInReadOnlyTransaction(transaction -> {
+        return ObjectUtils.requireNotNull(TransactionalExecutor.executeSafelyInReadOnlyTransaction(transaction -> {
             VelocityContext velocityContext = createVelocityContext(transaction, documentData);
             StringWriter writer = new StringWriter();
             VelocityEngine velocityEngine = new VelocityFactory().engine();