diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java
index 2dd0f2f8..8bf1de29 100644
--- a/src/main/java/com/beust/jcommander/JCommander.java
+++ b/src/main/java/com/beust/jcommander/JCommander.java
@@ -20,7 +20,6 @@
 
 import com.beust.jcommander.parser.DefaultParameterizedParser;
 import com.beust.jcommander.FuzzyMap.IKey;
-import com.beust.jcommander.StringKey;
 import com.beust.jcommander.converters.*;
 import com.beust.jcommander.internal.*;
 
@@ -315,7 +314,7 @@ public synchronized Console getConsole() {
      */
     // declared final since this is invoked from constructors
     public final void addObject(Object object) {
-        if (object instanceof Iterable i) {
+        if (object instanceof Iterable<?> i) {
             // Iterable
             i.forEach(objects::add);
         } else if (object.getClass().isArray()) {
@@ -1016,7 +1015,7 @@ private void initMainParameterValue(String arg) {
 
         // If it's a List<String>, we might need to create that list and then add the value to it.
         if (List.class.isAssignableFrom(type)) {
-            List result;
+            List<Object> result;
             if (object == null) {
                 result = Lists.newArrayList();
             } else {
diff --git a/src/main/java/com/beust/jcommander/Strings.java b/src/main/java/com/beust/jcommander/Strings.java
index e0dd4918..67998f71 100644
--- a/src/main/java/com/beust/jcommander/Strings.java
+++ b/src/main/java/com/beust/jcommander/Strings.java
@@ -1,7 +1,6 @@
 package com.beust.jcommander;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.stream.Collectors;
 
 public class Strings {
diff --git a/src/main/java/com/beust/jcommander/UnixStyleUsageFormatter.java b/src/main/java/com/beust/jcommander/UnixStyleUsageFormatter.java
index 16e8c955..4588b715 100644
--- a/src/main/java/com/beust/jcommander/UnixStyleUsageFormatter.java
+++ b/src/main/java/com/beust/jcommander/UnixStyleUsageFormatter.java
@@ -88,6 +88,7 @@ public void appendAllParametersDetails(StringBuilder out, int indentCount, Strin
             Class<?> type = pd.getParameterized().getType();
 
             if (type.isEnum()) {
+                @SuppressWarnings("unchecked")
                 String valueList = EnumSet.allOf((Class<? extends Enum>) type).toString();
 
                 // Prevent duplicate values list, since it is set as 'Options: [values]' if the description
diff --git a/src/main/java/com/beust/jcommander/WrappedParameter.java b/src/main/java/com/beust/jcommander/WrappedParameter.java
index 1d823158..90151d3d 100644
--- a/src/main/java/com/beust/jcommander/WrappedParameter.java
+++ b/src/main/java/com/beust/jcommander/WrappedParameter.java
@@ -11,8 +11,8 @@ public class WrappedParameter {
   private Parameter parameter;
   private DynamicParameter dynamicParameter;
 
-  public WrappedParameter(Parameter p) {
-    parameter = p;
+  public WrappedParameter(Parameter parameter) {
+    this.parameter = parameter;
   }
 
   public WrappedParameter(DynamicParameter p) {
diff --git a/src/test/java/com/beust/jcommander/DefaultProviderTest.java b/src/test/java/com/beust/jcommander/DefaultProviderTest.java
index 90075ceb..7ea31150 100644
--- a/src/test/java/com/beust/jcommander/DefaultProviderTest.java
+++ b/src/test/java/com/beust/jcommander/DefaultProviderTest.java
@@ -26,7 +26,6 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Set;
 
 public class DefaultProviderTest {
diff --git a/src/test/java/com/beust/jcommander/MethodSetterTest.java b/src/test/java/com/beust/jcommander/MethodSetterTest.java
index a0cfbbc6..99872cd5 100644
--- a/src/test/java/com/beust/jcommander/MethodSetterTest.java
+++ b/src/test/java/com/beust/jcommander/MethodSetterTest.java
@@ -17,15 +17,18 @@ class ArgsArityStringSetter {
       public void setPairs(List<String> pairs) {
         this.pairs = pairs;
       }
+
       public List<String> getPairs() {
         return this.pairs;
       }
+
       public List<String> pairs;
 
       @Parameter(description = "Rest")
       public void setRest(List<String> rest) {
         this.rest = rest;
       }
+
       public List<String> rest;
     }
     ArgsArityStringSetter args = new ArgsArityStringSetter();
@@ -49,7 +52,7 @@ public void setHost(String host) {
     boolean passed = false;
     try {
       JCommander.newBuilder().addObject(new Arg()).build().parse("--host", "host");
-    } catch(ParameterException ex) {
+    } catch (ParameterException ex) {
       Assert.assertEquals(ex.getCause(), null);
       passed = true;
     }