diff --git a/checkstyle.xml b/checkstyle.xml
index 7b0e7d5d4..bd80337fd 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -58,6 +58,9 @@
       <property name="processJavadoc" value="true"/>
     </module>
     <module name="OuterTypeFilename"/>
+
+    <!-- deactivated: 8 findings -->
+    <!--
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
       <property name="format"
@@ -65,6 +68,7 @@
       <property name="message"
         value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
     </module>
+    -->
 
     <!-- deactivated: 513 findings -->
     <!-- NOSONAR
@@ -76,7 +80,11 @@
     -->
 
     <!--<module name="AvoidStarImport"/>-->
+
+    <!-- deactivated: 14 findings -->
+    <!--
     <module name="OneTopLevelClass"/>
+    -->
     <module name="NoLineWrap">
       <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
     </module>
diff --git a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java
index 89a506336..49ded97fb 100644
--- a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java
+++ b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java
@@ -1993,9 +1993,7 @@ public Token yylex() throws java.io.IOException {
             return Token.TK_VERTICAL_BAR;
           }
         case 83: break;
-        case 45: {
-            /* ignore comments */
-          }
+        case 45: //fallthru
         case 84: break;
         case 9: {
             return Token.TK_PERIOD;
diff --git a/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java b/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java
index 1d9d9c4fe..62c9afe1a 100644
--- a/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java
+++ b/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java
@@ -29,9 +29,9 @@ public BorderRadiusCorner(float left, float right) {
 
     public BorderRadiusCorner(CSSName fromVal, CalculatedStyle style, CssContext ctx) {
         FSDerivedValue value = style.valueByName(fromVal);
-        if (value instanceof ListValue lValues) {
-            PropertyValue first = (PropertyValue) lValues.getValues().get(0);
-            PropertyValue second = lValues.getValues().size() > 1 ? (PropertyValue) lValues.getValues().get(1) : first;
+        if (value instanceof ListValue lv) {
+            PropertyValue first = (PropertyValue) lv.getValues().get(0);
+            PropertyValue second = lv.getValues().size() > 1 ? (PropertyValue) lv.getValues().get(1) : first;
 
             if (fromVal.equals(BORDER_TOP_LEFT_RADIUS) || fromVal.equals(BORDER_BOTTOM_RIGHT_RADIUS)) {
                 _right = calculate(fromVal, style, first, ctx);
diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java
index 1611ec6dd..f6237f441 100644
--- a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java
+++ b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java
@@ -739,19 +739,19 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) {
         if (newStroke == oldStroke) {
             return;
         }
-        if (!(newStroke instanceof BasicStroke nStroke)) {
+        if (!(newStroke instanceof BasicStroke newBasicStroke)) {
             return;
         }
         boolean oldOk = (oldStroke instanceof BasicStroke);
-        BasicStroke oStroke = null;
+        BasicStroke oldBasicStroke = null;
         if (oldOk) {
-            oStroke = (BasicStroke) oldStroke;
+            oldBasicStroke = (BasicStroke) oldStroke;
         }
-        if (!oldOk || nStroke.getLineWidth() != oStroke.getLineWidth()) {
-            cb.setLineWidth(nStroke.getLineWidth());
+        if (!oldOk || newBasicStroke.getLineWidth() != oldBasicStroke.getLineWidth()) {
+            cb.setLineWidth(newBasicStroke.getLineWidth());
         }
-        if (!oldOk || nStroke.getEndCap() != oStroke.getEndCap()) {
-            switch (nStroke.getEndCap()) {
+        if (!oldOk || newBasicStroke.getEndCap() != oldBasicStroke.getEndCap()) {
+            switch (newBasicStroke.getEndCap()) {
             case BasicStroke.CAP_BUTT:
                 cb.setLineCap(0);
                 break;
@@ -762,8 +762,8 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) {
                 cb.setLineCap(1);
             }
         }
-        if (!oldOk || nStroke.getLineJoin() != oStroke.getLineJoin()) {
-            switch (nStroke.getLineJoin()) {
+        if (!oldOk || newBasicStroke.getLineJoin() != oldBasicStroke.getLineJoin()) {
+            switch (newBasicStroke.getLineJoin()) {
             case BasicStroke.JOIN_MITER:
                 cb.setLineJoin(0);
                 break;
@@ -774,12 +774,12 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) {
                 cb.setLineJoin(1);
             }
         }
-        if (!oldOk || nStroke.getMiterLimit() != oStroke.getMiterLimit()) {
-            cb.setMiterLimit(nStroke.getMiterLimit());
+        if (!oldOk || newBasicStroke.getMiterLimit() != oldBasicStroke.getMiterLimit()) {
+            cb.setMiterLimit(newBasicStroke.getMiterLimit());
         }
-        boolean makeDash = isMakeDash(oldOk, nStroke, oStroke);
+        boolean makeDash = isMakeDash(oldOk, newBasicStroke, oldBasicStroke);
         if (makeDash) {
-            float[] dash = nStroke.getDashArray();
+            float[] dash = newBasicStroke.getDashArray();
             if (dash == null) {
                 cb.setLiteral("[]0 d\n");
             } else {
@@ -789,7 +789,7 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) {
                     cb.setLiteral(' ');
                 }
                 cb.setLiteral(']');
-                cb.setLiteral(nStroke.getDashPhase());
+                cb.setLiteral(newBasicStroke.getDashPhase());
                 cb.setLiteral(" d\n");
             }
         }
diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java
index dcdc04200..51626e066 100644
--- a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java
+++ b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java
@@ -98,9 +98,9 @@
  * <h1>Notes</h1>
  * This class was derived from a sample PDF creation listener
  * at "http://markmail.org/message/46t3bw7q6mbhvra2"
- * by Jesse Keller <jesse.keller@roche.com>.
+ * by <a href="mailto:jesse.keller@roche.com">Jesse Keller</a>
  *
- * @author Tim Telcik <tim.telcik@permeance.com.au>
+ * @author <a href="mailto:tim.telcik@permeance.com.au">Tim Telcik</a>
  * @see DefaultPDFCreationListener
  * @see PDFCreationListener
  * @see ITextRenderer
diff --git a/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java b/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java
index 500d9278f..eb2eb8290 100644
--- a/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java
+++ b/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java
@@ -938,6 +938,7 @@ void parseGlyph(Range r, GeneralPath gp, FlPoint pt) {
                     break;
                 case 30: // vhcurveto
                     hold = 4;
+                    //fallthru
                 case 31: // hvcurveto
                     for (i = 0; i < this.stackptr;) {
                         boolean hv = (((i + hold) & 4) == 0);