diff --git a/src/main/java/bisq/common/proto/ProtoUtil.java b/src/main/java/bisq/common/proto/ProtoUtil.java
index 2705cea..0237229 100644
--- a/src/main/java/bisq/common/proto/ProtoUtil.java
+++ b/src/main/java/bisq/common/proto/ProtoUtil.java
@@ -26,6 +26,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -84,7 +85,7 @@ public static <T extends Message> Iterable<T> collectionToProto(Collection<? ext
                         return null;
                     }
                 })
-                .filter(e -> e != null)
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 
diff --git a/src/main/java/bisq/common/util/Utilities.java b/src/main/java/bisq/common/util/Utilities.java
index bcc6fa1..afeb43e 100644
--- a/src/main/java/bisq/common/util/Utilities.java
+++ b/src/main/java/bisq/common/util/Utilities.java
@@ -312,8 +312,7 @@ public static byte[] concatByteArrays(byte[]... arrays) {
     }
 
     public static <T> T jsonToObject(String jsonString, Class<T> classOfT) {
-        Gson gson =
-                new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE).setPrettyPrinting().create();
+        Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE).setPrettyPrinting().create();
         return gson.fromJson(jsonString, classOfT);
     }
 
@@ -549,9 +548,8 @@ public static String getShortId(String id, String sep) {
             return id.substring(0, Math.min(8, id.length()));
     }
 
-    @SuppressWarnings("unchecked")
-    public static String collectionToCSV(Collection collection) {
-        return collection.stream().map(Object::toString).collect(Collectors.joining(",")).toString();
+    public static String collectionToCSV(Collection<String> collection) {
+        return collection.stream().map(Object::toString).collect(Collectors.joining(","));
     }
 
     public static void removeCryptographyRestrictions() {
diff --git a/src/main/proto/pb.proto b/src/main/proto/pb.proto
index f04a747..ea24eb2 100644
--- a/src/main/proto/pb.proto
+++ b/src/main/proto/pb.proto
@@ -1474,7 +1474,7 @@ message MyVote {
 }
 
 message ParamChangeEvent {
-    // We use odingal instead of Enum as enaums in PB are a pain... as well we want to be more flexible at changes
+    // We use ordinal instead of Enum as enums in PB are a pain... as well we want to be more flexible at changes
     int32 dao_param_ordinal = 1;
     int64 value = 2;
     int32 block_height = 3;