diff --git a/vavr/src-gen/main/java/io/vavr/API.java b/vavr/src-gen/main/java/io/vavr/API.java
index 96d379f5f..8afdc2c16 100644
--- a/vavr/src-gen/main/java/io/vavr/API.java
+++ b/vavr/src-gen/main/java/io/vavr/API.java
@@ -5123,7 +5123,7 @@ public static final class Case0<T, R> implements Case<T, R> {
             private static final long serialVersionUID = 1L;
 
             private final Pattern0<T> pattern;
-            private final transient Function<? super T, ? extends R> f;
+            private transient final Function<? super T, ? extends R> f;
 
             private Case0(Pattern0<T> pattern, Function<? super T, ? extends R> f) {
                 this.pattern = pattern;
@@ -5146,7 +5146,7 @@ public static final class Case1<T, T1, R> implements Case<T, R> {
             private static final long serialVersionUID = 1L;
 
             private final Pattern1<T, T1> pattern;
-            private final transient Function<? super T1, ? extends R> f;
+            private transient final Function<? super T1, ? extends R> f;
 
             private Case1(Pattern1<T, T1> pattern, Function<? super T1, ? extends R> f) {
                 this.pattern = pattern;
@@ -5169,7 +5169,7 @@ public static final class Case2<T, T1, T2, R> implements Case<T, R> {
             private static final long serialVersionUID = 1L;
 
             private final Pattern2<T, T1, T2> pattern;
-            private final transient BiFunction<? super T1, ? super T2, ? extends R> f;
+            private transient final BiFunction<? super T1, ? super T2, ? extends R> f;
 
             private Case2(Pattern2<T, T1, T2> pattern, BiFunction<? super T1, ? super T2, ? extends R> f) {
                 this.pattern = pattern;
diff --git a/vavr/src/main/java/io/vavr/Lazy.java b/vavr/src/main/java/io/vavr/Lazy.java
index a4993b963..58f115931 100644
--- a/vavr/src/main/java/io/vavr/Lazy.java
+++ b/vavr/src/main/java/io/vavr/Lazy.java
@@ -65,6 +65,8 @@ public final class Lazy<T> implements Value<T>, Supplier<T>, Serializable {
 
     // read http://javarevisited.blogspot.de/2014/05/double-checked-locking-on-singleton-in-java.html
     private transient volatile Supplier<? extends T> supplier;
+
+    @SuppressWarnings("serial") // Conditionally serializable
     private T value; // will behave as a volatile in reality, because a supplier volatile read will update all fields (see https://www.cs.umd.edu/~pugh/java/memoryModel/jsr-133-faq.html#volatile)
 
     // should not be called directly
diff --git a/vavr/src/main/java/io/vavr/MatchError.java b/vavr/src/main/java/io/vavr/MatchError.java
index 53c51636c..877662f94 100644
--- a/vavr/src/main/java/io/vavr/MatchError.java
+++ b/vavr/src/main/java/io/vavr/MatchError.java
@@ -30,6 +30,7 @@ public class MatchError extends NoSuchElementException {
 
     private static final long serialVersionUID = 1L;
 
+    @SuppressWarnings("serial") // Conditionally serializable
     private final Object obj;
 
     /**
diff --git a/vavr/src/main/java/io/vavr/collection/JavaConverters.java b/vavr/src/main/java/io/vavr/collection/JavaConverters.java
index 11d81c6b8..8ce26b42e 100644
--- a/vavr/src/main/java/io/vavr/collection/JavaConverters.java
+++ b/vavr/src/main/java/io/vavr/collection/JavaConverters.java
@@ -62,6 +62,7 @@ private static abstract class HasDelegate<C extends Traversable<?>> implements S
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         private C delegate;
         private final boolean mutable;
 
diff --git a/vavr/src/main/java/io/vavr/control/Try.java b/vavr/src/main/java/io/vavr/control/Try.java
index 65ebbf6db..1e52c713d 100644
--- a/vavr/src/main/java/io/vavr/control/Try.java
+++ b/vavr/src/main/java/io/vavr/control/Try.java
@@ -1088,6 +1088,7 @@ final class Success<T> implements Try<T>, Serializable {
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         private final T value;
 
         /**
diff --git a/vavr/src/main/java/io/vavr/control/Validation.java b/vavr/src/main/java/io/vavr/control/Validation.java
index 94c4b4d6b..4cda62faa 100644
--- a/vavr/src/main/java/io/vavr/control/Validation.java
+++ b/vavr/src/main/java/io/vavr/control/Validation.java
@@ -671,6 +671,7 @@ final class Valid<E, T> implements Validation<E, T>, Serializable {
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         private final T value;
 
         /**
@@ -734,6 +735,7 @@ final class Invalid<E, T> implements Validation<E, T>, Serializable {
 
         private static final long serialVersionUID = 1L;
 
+        @SuppressWarnings("serial") // Conditionally serializable
         private final E error;
 
         /**