diff --git a/src/main/java/net/finmath/climate/models/dice/DICEModel.java b/src/main/java/net/finmath/climate/models/dice/DICEModel.java
index 6c6fb6ccae..89217cf5c1 100644
--- a/src/main/java/net/finmath/climate/models/dice/DICEModel.java
+++ b/src/main/java/net/finmath/climate/models/dice/DICEModel.java
@@ -4,13 +4,24 @@
 import java.util.Map;
 import java.util.function.DoubleUnaryOperator;
 import java.util.function.Function;
-import java.util.function.IntToDoubleFunction;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import java.util.logging.Logger;
 
 import net.finmath.climate.models.ClimateModel;
-import net.finmath.climate.models.dice.submodels.*;
+import net.finmath.climate.models.dice.submodels.AbatementCostFunction;
+import net.finmath.climate.models.dice.submodels.CarbonConcentration3DScalar;
+import net.finmath.climate.models.dice.submodels.DamageFromTemperature;
+import net.finmath.climate.models.dice.submodels.EmissionExternalFunction;
+import net.finmath.climate.models.dice.submodels.EvolutionOfCapital;
+import net.finmath.climate.models.dice.submodels.EvolutionOfCarbonConcentration;
+import net.finmath.climate.models.dice.submodels.EvolutionOfEmissionIndustrialIntensity;
+import net.finmath.climate.models.dice.submodels.EvolutionOfPopulation;
+import net.finmath.climate.models.dice.submodels.EvolutionOfProductivity;
+import net.finmath.climate.models.dice.submodels.EvolutionOfTemperature;
+import net.finmath.climate.models.dice.submodels.ForcingExternalFunction;
+import net.finmath.climate.models.dice.submodels.ForcingFunction;
+import net.finmath.climate.models.dice.submodels.Temperature2DScalar;
 import net.finmath.stochastic.RandomVariable;
 import net.finmath.stochastic.Scalar;
 import net.finmath.time.TimeDiscretization;
diff --git a/src/main/java/net/finmath/singleswaprate/data/DataTableBasic.java b/src/main/java/net/finmath/singleswaprate/data/DataTableBasic.java
index e4f142bb1a..93aa1deab1 100644
--- a/src/main/java/net/finmath/singleswaprate/data/DataTableBasic.java
+++ b/src/main/java/net/finmath/singleswaprate/data/DataTableBasic.java
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.TreeSet;
 
+import net.finmath.singleswaprate.data.DataTable.TableConvention;
 import net.finmath.time.Schedule;
 import net.finmath.time.SchedulePrototype;
 
diff --git a/src/main/java/net/finmath/singleswaprate/data/DataTableInterpolated.java b/src/main/java/net/finmath/singleswaprate/data/DataTableInterpolated.java
index 0da4e52f3d..d32b2d1829 100644
--- a/src/main/java/net/finmath/singleswaprate/data/DataTableInterpolated.java
+++ b/src/main/java/net/finmath/singleswaprate/data/DataTableInterpolated.java
@@ -11,6 +11,7 @@
 import org.apache.commons.math3.analysis.interpolation.PiecewiseBicubicSplineInterpolator;
 import org.apache.commons.math3.analysis.interpolation.UnivariateInterpolator;
 
+import net.finmath.singleswaprate.data.DataTable.TableConvention;
 import net.finmath.time.SchedulePrototype;
 
 
diff --git a/src/test/java/net/finmath/montecarlo/RandomVariableFromDoubleArrayTest.java b/src/test/java/net/finmath/montecarlo/RandomVariableFromDoubleArrayTest.java
index 6b2d221470..e737fb0d61 100644
--- a/src/test/java/net/finmath/montecarlo/RandomVariableFromDoubleArrayTest.java
+++ b/src/test/java/net/finmath/montecarlo/RandomVariableFromDoubleArrayTest.java
@@ -1,6 +1,6 @@
 package net.finmath.montecarlo;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;