diff --git a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
index 01a124c9e..96f78ac0e 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
@@ -86,11 +86,11 @@ public class DataReader {
         return high << 32 | low;
     }
 
-    public int read(byte[] buffer) throws IOException {
+    public int read(final byte[] buffer) throws IOException {
         return read(buffer, 0, buffer.length);
     }
 
-    public int read(byte[] buffer, int offset, int count) throws IOException {
+    public int read(final byte[] buffer, int offset, int count) throws IOException {
         if (readCount < 0) {
             return -1;
         }
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
index 66e9ce6f3..41a2331ba 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4FromDashWriter.java
@@ -640,7 +640,7 @@ public class Mp4FromDashWriter {
         return size;
     }
 
-    private byte[] makeMdat(long refSize, boolean is64) {
+    private byte[] makeMdat(long refSize, final boolean is64) {
         if (is64) {
             refSize += 16;
         } else {
@@ -736,8 +736,10 @@ public class Mp4FromDashWriter {
         int start = auxOffset();
 
         auxWrite(new byte[]{
-                0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x6B, // trak header
-                0x00, 0x00, 0x00, 0x68, 0x74, 0x6B, 0x68, 0x64, 0x01, 0x00, 0x00, 0x03 // tkhd header
+                // trak header
+                0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x6B,
+                // tkhd header
+                0x00, 0x00, 0x00, 0x68, 0x74, 0x6B, 0x68, 0x64, 0x01, 0x00, 0x00, 0x03
         });
 
         ByteBuffer buffer = ByteBuffer.allocate(48);
@@ -857,7 +859,7 @@ public class Mp4FromDashWriter {
                 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x20, 0x4E, 0x65,
                 0x77, 0x50, 0x69, 0x70, 0x65, 0x20, 0x28, 0x41, 0x20, 0x6C, 0x69, 0x62, 0x72, 0x65,
                 0x20, 0x6C, 0x69, 0x67, 0x68, 0x74, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x73,
-                0x74, 0x72, 0x65, 0x61, 0x6D, 0x69,0x6E, 0x67,
+                0x74, 0x72, 0x65, 0x61, 0x6D, 0x69, 0x6E, 0x67,
                 0x20, 0x66, 0x72, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x64, 0x20, 0x66, 0x6F, 0x72, 0x20,
                 0x41, 0x6E,
                 0x64, 0x72, 0x6F, 0x69, 0x64, 0x29, 0x2E
diff --git a/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
index d655b4d00..e24464dc0 100644
--- a/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
+++ b/app/src/main/java/org/schabi/newpipe/streams/OggFromWebMWriter.java
@@ -419,7 +419,7 @@ public class OggFromWebMWriter implements Closeable {
         }
     }
 
-    private int calcCrc32(int initialCrc, byte[] buffer, int size) {
+    private int calcCrc32(int initialCrc, final byte[] buffer, final int size) {
         for (int i = 0; i < size; i++) {
             int reg = (initialCrc >>> 24) & 0xff;
             initialCrc = (initialCrc << 8) ^ crc32Table[reg ^ (buffer[i] & 0xff)];
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 6b53cfc5b..d015a9e03 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -10,4 +10,24 @@
   <suppress checks="FinalParameters"
     files="InfoListAdapter.java"
     lines="253,325"/>
+
+  <!-- org.schabi.newpipe.streams -->
+  <suppress checks="FinalParameters"
+      files="DataReader.java"
+      lines="46,93"/>
+
+  <suppress checks="FinalParameters"
+      files="Mp4FromDashWriter.java"
+      lines="643"/>
+
+  <suppress checks="FinalParameters"
+      files="OggFromWebMWriter.java"
+      lines="380,422"/>
+
+  <suppress checks="FinalParameters"
+      files="WebMWriter.java"
+      lines="419,591"/>
+  <suppress checks="LineLength"
+      files="WebMWriter.java"
+      lines="156,158"/>
 </suppressions>