diff --git a/Classification/Core/src/main/java/org/tribuo/classification/baseline/DummyClassifierTrainer.java b/Classification/Core/src/main/java/org/tribuo/classification/baseline/DummyClassifierTrainer.java
index e728fed4c..5b477cf5d 100644
--- a/Classification/Core/src/main/java/org/tribuo/classification/baseline/DummyClassifierTrainer.java
+++ b/Classification/Core/src/main/java/org/tribuo/classification/baseline/DummyClassifierTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public void postConfig() {
 
     @Override
     public Model<Label> train(Dataset<Label> examples, Map<String, Provenance> instanceProvenance) {
-        return(train(examples, instanceProvenance, INCREMENT_INVOCATION_COUNT));
+        return train(examples, instanceProvenance, INCREMENT_INVOCATION_COUNT) ;
     }
 
     @Override
diff --git a/Classification/Core/src/main/java/org/tribuo/classification/ensemble/AdaBoostTrainer.java b/Classification/Core/src/main/java/org/tribuo/classification/ensemble/AdaBoostTrainer.java
index 266caa2fc..f8987f2a0 100644
--- a/Classification/Core/src/main/java/org/tribuo/classification/ensemble/AdaBoostTrainer.java
+++ b/Classification/Core/src/main/java/org/tribuo/classification/ensemble/AdaBoostTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -236,16 +236,21 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        trainInvocationCounter = 0;
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-            trainInvocationCounter++;
+
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
         }
 
     }
 
-    private float accuracy(List<Prediction<Label>> predictions, Dataset<Label> examples, float[] weights) {
+    /**
+     * Compute the accuracy of a set of predictions.
+     * @param predictions The base learner predictions.
+     * @param examples The training examples.
+     * @param weights The current example weights.
+     * @return The accuracy.
+     */
+    private static float accuracy(List<Prediction<Label>> predictions, Dataset<Label> examples, float[] weights) {
         float correctSum = 0;
         float total = 0;
         for (int i = 0; i < predictions.size(); i++) {
diff --git a/Classification/DecisionTree/src/test/java/org/tribuo/classification/dtree/TestCART.java b/Classification/DecisionTree/src/test/java/org/tribuo/classification/dtree/TestCART.java
index c82ceb8b1..5f21db086 100644
--- a/Classification/DecisionTree/src/test/java/org/tribuo/classification/dtree/TestCART.java
+++ b/Classification/DecisionTree/src/test/java/org/tribuo/classification/dtree/TestCART.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -172,7 +172,7 @@ public void testSetInvocationCount() {
 
         // The number of times to call train before final training.
         // Original trainer will be trained numOfInvocations + 1 times
-        // New trainer will have it's invocation count set to numOfInvocations then trained once
+        // New trainer will have its invocation count set to numOfInvocations then trained once
         int numOfInvocations = 2;
 
         // Create the first model and train it numOfInvocations + 1 times
diff --git a/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesTrainer.java b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesTrainer.java
index bc3136e27..8d41cd9f4 100644
--- a/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesTrainer.java
+++ b/Classification/MultinomialNaiveBayes/src/main/java/org/tribuo/classification/mnb/MultinomialNaiveBayesTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public class MultinomialNaiveBayesTrainer implements Trainer<Label>, WeightedExa
     @Config(description="Smoothing parameter.")
     private double alpha = 1.0;
 
-    private int invocationCount = 0;
+    private int trainInvocationCount = 0;
 
     /**
      * Constructs a multinomial naive bayes trainer using a smoothing value of 1.0.
@@ -111,7 +111,7 @@ public Model<Label> train(Dataset<Label> examples, Map<String, Provenance> runPr
         }
         TrainerProvenance trainerProvenance = getProvenance();
         ModelProvenance provenance = new ModelProvenance(MultinomialNaiveBayesModel.class.getName(), OffsetDateTime.now(), examples.getProvenance(), trainerProvenance, runProvenance);
-        invocationCount++;
+        trainInvocationCount++;
 
         SparseVector[] labelVectors = new SparseVector[labelInfos.size()];
 
@@ -129,7 +129,7 @@ public Model<Label> train(Dataset<Label> examples, Map<String, Provenance> runPr
 
     @Override
     public int getInvocationCount() {
-        return invocationCount;
+        return trainInvocationCount;
     }
 
     @Override
@@ -138,7 +138,7 @@ public void setInvocationCount(int invocationCount) {
             throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
         }
 
-        this.invocationCount = invocationCount;
+        this.trainInvocationCount = invocationCount;
     }
 
     @Override
diff --git a/Classification/SGD/src/main/java/org/tribuo/classification/sgd/kernel/KernelSVMTrainer.java b/Classification/SGD/src/main/java/org/tribuo/classification/sgd/kernel/KernelSVMTrainer.java
index 9c1736e21..40b29ca82 100644
--- a/Classification/SGD/src/main/java/org/tribuo/classification/sgd/kernel/KernelSVMTrainer.java
+++ b/Classification/SGD/src/main/java/org/tribuo/classification/sgd/kernel/KernelSVMTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -238,12 +238,9 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        trainInvocationCounter = 0;
 
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-            trainInvocationCounter++;
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
         }
 
     }
diff --git a/Classification/SGD/src/test/java/org/tribuo/classification/sgd/kernel/TestSGDKernel.java b/Classification/SGD/src/test/java/org/tribuo/classification/sgd/kernel/TestSGDKernel.java
index 608d6cdac..f9c99952c 100644
--- a/Classification/SGD/src/test/java/org/tribuo/classification/sgd/kernel/TestSGDKernel.java
+++ b/Classification/SGD/src/test/java/org/tribuo/classification/sgd/kernel/TestSGDKernel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ public void testSetInvocationCount() {
 
         // The number of times to call train before final training.
         // Original trainer will be trained numOfInvocations + 1 times
-        // New trainer will have it's invocation count set to numOfInvocations then trained once
+        // New trainer will have its invocation count set to numOfInvocations then trained once
         int numOfInvocations = 2;
 
         // Create the first model and train it numOfInvocations + 1 times
diff --git a/Classification/SGD/src/test/java/org/tribuo/classification/sgd/linear/TestSGDLinear.java b/Classification/SGD/src/test/java/org/tribuo/classification/sgd/linear/TestSGDLinear.java
index 3e80604f8..e386bcfaf 100644
--- a/Classification/SGD/src/test/java/org/tribuo/classification/sgd/linear/TestSGDLinear.java
+++ b/Classification/SGD/src/test/java/org/tribuo/classification/sgd/linear/TestSGDLinear.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Classification/XGBoost/src/main/java/org/tribuo/classification/xgboost/XGBoostClassificationTrainer.java b/Classification/XGBoost/src/main/java/org/tribuo/classification/xgboost/XGBoostClassificationTrainer.java
index ca6f6c22c..bfa857f65 100644
--- a/Classification/XGBoost/src/main/java/org/tribuo/classification/xgboost/XGBoostClassificationTrainer.java
+++ b/Classification/XGBoost/src/main/java/org/tribuo/classification/xgboost/XGBoostClassificationTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Clustering/KMeans/src/main/java/org/tribuo/clustering/kmeans/KMeansTrainer.java b/Clustering/KMeans/src/main/java/org/tribuo/clustering/kmeans/KMeansTrainer.java
index a3f4e2546..7065a5d1b 100644
--- a/Clustering/KMeans/src/main/java/org/tribuo/clustering/kmeans/KMeansTrainer.java
+++ b/Clustering/KMeans/src/main/java/org/tribuo/clustering/kmeans/KMeansTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -318,12 +318,9 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        trainInvocationCounter = 0;
 
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-            trainInvocationCounter++;
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
         }
 
     }
diff --git a/Clustering/KMeans/src/test/java/org/tribuo/clustering/kmeans/TestKMeans.java b/Clustering/KMeans/src/test/java/org/tribuo/clustering/kmeans/TestKMeans.java
index c36b78ecb..bcb58dbb0 100644
--- a/Clustering/KMeans/src/test/java/org/tribuo/clustering/kmeans/TestKMeans.java
+++ b/Clustering/KMeans/src/test/java/org/tribuo/clustering/kmeans/TestKMeans.java
@@ -29,15 +29,14 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.tribuo.math.la.DenseVector;
-import org.tribuo.math.la.Tensor;
-import org.tribuo.math.optimisers.AdaGrad;
 import org.tribuo.test.Helpers;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * Smoke tests for k-means.
diff --git a/Common/LibLinear/src/main/java/org/tribuo/common/liblinear/LibLinearTrainer.java b/Common/LibLinear/src/main/java/org/tribuo/common/liblinear/LibLinearTrainer.java
index 44dcb8be5..0a5bc3bc2 100644
--- a/Common/LibLinear/src/main/java/org/tribuo/common/liblinear/LibLinearTrainer.java
+++ b/Common/LibLinear/src/main/java/org/tribuo/common/liblinear/LibLinearTrainer.java
@@ -165,7 +165,7 @@ public int getInvocationCount() {
     }
 
     @Override
-    public void setInvocationCount(int invocationCount) {
+    public synchronized void setInvocationCount(int invocationCount) {
         if(invocationCount < 0){
             throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
         }
diff --git a/Common/LibSVM/src/main/java/org/tribuo/common/libsvm/LibSVMTrainer.java b/Common/LibSVM/src/main/java/org/tribuo/common/libsvm/LibSVMTrainer.java
index 8cf5970d4..37e28a489 100644
--- a/Common/LibSVM/src/main/java/org/tribuo/common/libsvm/LibSVMTrainer.java
+++ b/Common/LibSVM/src/main/java/org/tribuo/common/libsvm/LibSVMTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -276,12 +276,16 @@ public int getInvocationCount() {
     }
 
     @Override
-    public void setInvocationCount(int invocationCount) {
+    public synchronized void setInvocationCount(int invocationCount) {
         if(invocationCount < 0){
             throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
         }
 
-        this.trainInvocationCounter = invocationCount;
+        rng = new SplittableRandom(seed);
+
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
+        }
     }
 
     /**
diff --git a/Common/NearestNeighbour/src/main/java/org/tribuo/common/nearest/KNNTrainer.java b/Common/NearestNeighbour/src/main/java/org/tribuo/common/nearest/KNNTrainer.java
index 1621e99e4..c200410a2 100644
--- a/Common/NearestNeighbour/src/main/java/org/tribuo/common/nearest/KNNTrainer.java
+++ b/Common/NearestNeighbour/src/main/java/org/tribuo/common/nearest/KNNTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@ public enum Distance {
     @Config(description="The threading model to use.")
     private Backend backend = Backend.THREADPOOL;
 
-    private int invocationCount = 0;
+    private int trainInvocationCount = 0;
 
     /**
      * For olcut.
@@ -131,7 +131,7 @@ public Model<T> train(Dataset<T> examples, Map<String, Provenance> runProvenance
         if(invocationCount != INCREMENT_INVOCATION_COUNT){
             setInvocationCount(invocationCount);
         }
-        invocationCount++;
+        trainInvocationCount++;
 
         ModelProvenance provenance = new ModelProvenance(KNNModel.class.getName(), OffsetDateTime.now(), examples.getProvenance(), getProvenance(), runProvenance);
 
@@ -145,7 +145,7 @@ public String toString() {
 
     @Override
     public int getInvocationCount() {
-        return invocationCount;
+        return trainInvocationCount;
     }
 
     @Override
@@ -154,7 +154,7 @@ public void setInvocationCount(int invocationCount) {
             throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
         }
 
-        this.invocationCount = invocationCount;
+        this.trainInvocationCount = invocationCount;
     }
 
     @Override
diff --git a/Common/SGD/src/main/java/org/tribuo/common/sgd/AbstractSGDTrainer.java b/Common/SGD/src/main/java/org/tribuo/common/sgd/AbstractSGDTrainer.java
index 65743bab4..0b0574641 100644
--- a/Common/SGD/src/main/java/org/tribuo/common/sgd/AbstractSGDTrainer.java
+++ b/Common/SGD/src/main/java/org/tribuo/common/sgd/AbstractSGDTrainer.java
@@ -262,12 +262,10 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-        }
-        trainInvocationCounter = invocationCount;
 
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
+        }
     }
 
     /**
diff --git a/Common/Trees/src/main/java/org/tribuo/common/tree/AbstractCARTTrainer.java b/Common/Trees/src/main/java/org/tribuo/common/tree/AbstractCARTTrainer.java
index 546675e06..ef3f5e66f 100644
--- a/Common/Trees/src/main/java/org/tribuo/common/tree/AbstractCARTTrainer.java
+++ b/Common/Trees/src/main/java/org/tribuo/common/tree/AbstractCARTTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -147,12 +147,9 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        trainInvocationCounter = 0;
 
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-            trainInvocationCounter++;
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
         }
 
     }
diff --git a/Common/XGBoost/src/main/java/org/tribuo/common/xgboost/XGBoostTrainer.java b/Common/XGBoost/src/main/java/org/tribuo/common/xgboost/XGBoostTrainer.java
index 88b102b4f..86890c9a5 100644
--- a/Common/XGBoost/src/main/java/org/tribuo/common/xgboost/XGBoostTrainer.java
+++ b/Common/XGBoost/src/main/java/org/tribuo/common/xgboost/XGBoostTrainer.java
@@ -384,7 +384,7 @@ public int getInvocationCount() {
     }
 
     @Override
-    public void setInvocationCount(int invocationCount) {
+    public synchronized void setInvocationCount(int invocationCount) {
         if(invocationCount < 0){
             throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
         }
diff --git a/Core/src/main/java/org/tribuo/SparseTrainer.java b/Core/src/main/java/org/tribuo/SparseTrainer.java
index dd07cf984..bd195fcba 100644
--- a/Core/src/main/java/org/tribuo/SparseTrainer.java
+++ b/Core/src/main/java/org/tribuo/SparseTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,5 +52,11 @@ default public SparseModel<T> train(Dataset<T> examples) {
      * @param invocationCount The state of the RNG the trainer should be set to before training
      * @return a predictive model that can be used to generate predictions for new examples.
      */
-    public SparseModel<T> train(Dataset<T> examples, Map<String, Provenance> runProvenance, int invocationCount);
+    @Override
+    public default SparseModel<T> train(Dataset<T> examples, Map<String, Provenance> runProvenance, int invocationCount) {
+        synchronized (this){
+            setInvocationCount(invocationCount);
+            return train(examples, runProvenance);
+        }
+    }
 }
diff --git a/Core/src/main/java/org/tribuo/Trainer.java b/Core/src/main/java/org/tribuo/Trainer.java
index ffd480dad..dedf50413 100644
--- a/Core/src/main/java/org/tribuo/Trainer.java
+++ b/Core/src/main/java/org/tribuo/Trainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,11 +89,13 @@ public default Model<T> train(Dataset<T> examples, Map<String, Provenance> runPr
      * This is used when reproducing a Tribuo-trained model by setting the state of the RNG to
      * what it was at when Tribuo trained the original model by simulating invocations of the train method.
      * This method should ALWAYS be overridden, and the default method is purely for compatibility.
+     * <p>
+     * In a future major release this default implementation will be removed.
      * @param  invocationCount the number of invocations of the train method to simulate
      */
     default public void setInvocationCount(int invocationCount){
         Logger.getLogger(this.getClass().getName()).warning("This class is using the default implementation of " +
-                "setInvocationCount and so might not behave as expected. We highly recommend overriding this method " +
-                "to function as per the documentation.");
+                "setInvocationCount and so might not behave as expected when reproduced. We highly recommend overriding " +
+                "this method as per the documentation.");
     }
 }
diff --git a/Core/src/main/java/org/tribuo/ensemble/BaggingTrainer.java b/Core/src/main/java/org/tribuo/ensemble/BaggingTrainer.java
index 85a6f1e39..228be0f69 100644
--- a/Core/src/main/java/org/tribuo/ensemble/BaggingTrainer.java
+++ b/Core/src/main/java/org/tribuo/ensemble/BaggingTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -191,12 +191,9 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        trainInvocationCounter = 0;
 
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-            trainInvocationCounter++;
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
         }
 
     }
diff --git a/Core/src/main/java/org/tribuo/hash/HashingTrainer.java b/Core/src/main/java/org/tribuo/hash/HashingTrainer.java
index a3ec6883f..f134b87a1 100644
--- a/Core/src/main/java/org/tribuo/hash/HashingTrainer.java
+++ b/Core/src/main/java/org/tribuo/hash/HashingTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Core/src/main/java/org/tribuo/transform/TransformTrainer.java b/Core/src/main/java/org/tribuo/transform/TransformTrainer.java
index 6806c5df7..dde55f8c9 100644
--- a/Core/src/main/java/org/tribuo/transform/TransformTrainer.java
+++ b/Core/src/main/java/org/tribuo/transform/TransformTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/MultiLabel/Core/src/main/java/org/tribuo/multilabel/baseline/ClassifierChainTrainer.java b/MultiLabel/Core/src/main/java/org/tribuo/multilabel/baseline/ClassifierChainTrainer.java
index 7cc8f417d..5f9f2347e 100644
--- a/MultiLabel/Core/src/main/java/org/tribuo/multilabel/baseline/ClassifierChainTrainer.java
+++ b/MultiLabel/Core/src/main/java/org/tribuo/multilabel/baseline/ClassifierChainTrainer.java
@@ -167,7 +167,12 @@ public ClassifierChainModel train(Dataset<MultiLabel> examples) {
     }
 
     @Override
-    public ClassifierChainModel train(Dataset<MultiLabel> examples, Map<String, Provenance> runProvenance) {
+    public ClassifierChainModel train(Dataset<MultiLabel> examples, Map<String,Provenance> runProvenance) {
+        return train(examples, runProvenance, INCREMENT_INVOCATION_COUNT);
+    }
+
+    @Override
+    public ClassifierChainModel train(Dataset<MultiLabel> examples, Map<String, Provenance> runProvenance, int invocationCount) {
         if (examples.getOutputInfo().getUnknownCount() > 0) {
             throw new IllegalArgumentException("The supplied Dataset contained unknown Outputs, and this Trainer is supervised.");
         }
@@ -175,6 +180,9 @@ public ClassifierChainModel train(Dataset<MultiLabel> examples, Map<String, Prov
         TrainerProvenance trainerProvenance;
         SplittableRandom localRNG;
         synchronized(this) {
+            if(invocationCount != INCREMENT_INVOCATION_COUNT) {
+                setInvocationCount(invocationCount);
+            }
             localRNG = rng.split();
             trainerProvenance = getProvenance();
             trainInvocationCounter++;
@@ -257,6 +265,18 @@ public int getInvocationCount() {
         return trainInvocationCounter;
     }
 
+    @Override
+    public synchronized void setInvocationCount(int invocationCount){
+        if(invocationCount < 0){
+            throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
+        }
+
+        rng = new SplittableRandom(seed);
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
+        }
+    }
+
     @Override
     public TrainerProvenance getProvenance() {
         return new TrainerProvenanceImpl(this);
diff --git a/MultiLabel/Core/src/main/java/org/tribuo/multilabel/ensemble/CCEnsembleTrainer.java b/MultiLabel/Core/src/main/java/org/tribuo/multilabel/ensemble/CCEnsembleTrainer.java
index 00feeafa4..5e778e954 100644
--- a/MultiLabel/Core/src/main/java/org/tribuo/multilabel/ensemble/CCEnsembleTrainer.java
+++ b/MultiLabel/Core/src/main/java/org/tribuo/multilabel/ensemble/CCEnsembleTrainer.java
@@ -33,6 +33,7 @@
 import org.tribuo.provenance.TrainerProvenance;
 import org.tribuo.provenance.impl.TrainerProvenanceImpl;
 
+import javax.xml.crypto.Data;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -109,10 +110,18 @@ public WeightedEnsembleModel<MultiLabel> train(Dataset<MultiLabel> examples) {
 
     @Override
     public WeightedEnsembleModel<MultiLabel> train(Dataset<MultiLabel> examples, Map<String, Provenance> runProvenance) {
+        return train(examples,runProvenance,INCREMENT_INVOCATION_COUNT);
+    }
+
+    @Override
+    public WeightedEnsembleModel<MultiLabel> train(Dataset<MultiLabel> examples, Map<String, Provenance> runProvenance, int invocationCount) {
         // Creates a new RNG, adds one to the invocation count.
         SplittableRandom localRNG;
         TrainerProvenance trainerProvenance;
         synchronized(this) {
+            if(invocationCount != INCREMENT_INVOCATION_COUNT) {
+                setInvocationCount(invocationCount);
+            }
             localRNG = rng.split();
             trainerProvenance = getProvenance();
             trainInvocationCounter++;
@@ -142,6 +151,18 @@ public int getInvocationCount() {
         return trainInvocationCounter;
     }
 
+    @Override
+    public synchronized void setInvocationCount(int invocationCount){
+        if(invocationCount < 0){
+            throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
+        }
+
+        rng = new SplittableRandom(seed);
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
+        }
+    }
+
     @Override
     public TrainerProvenance getProvenance() {
         return new TrainerProvenanceImpl(this);
diff --git a/Regression/Core/src/main/java/org/tribuo/regression/baseline/DummyRegressionTrainer.java b/Regression/Core/src/main/java/org/tribuo/regression/baseline/DummyRegressionTrainer.java
index 39aba5449..bdcb88d19 100644
--- a/Regression/Core/src/main/java/org/tribuo/regression/baseline/DummyRegressionTrainer.java
+++ b/Regression/Core/src/main/java/org/tribuo/regression/baseline/DummyRegressionTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public enum DummyType {
     @Config(description="The seed for the RNG.")
     private long seed = 1L;
 
-    private int invocationCount = 0;
+    private int trainInvocationCounter = 0;
 
     private DummyRegressionTrainer() { }
 
@@ -114,7 +114,7 @@ public DummyRegressionModel train(Dataset<Regressor> examples, Map<String, Prove
             setInvocationCount(invocationCount);
         }
         ModelProvenance provenance = new ModelProvenance(DummyRegressionModel.class.getName(), OffsetDateTime.now(), examples.getProvenance(), getProvenance(), instanceProvenance);
-        invocationCount++;
+        trainInvocationCounter++;
         ImmutableOutputInfo<Regressor> outputInfo = examples.getOutputIDInfo();
         Set<Regressor> domain = outputInfo.getDomain();
         double[][] outputs = new double[outputInfo.size()][examples.size()];
@@ -204,7 +204,7 @@ public String toString() {
 
     @Override
     public int getInvocationCount() {
-        return invocationCount;
+        return trainInvocationCounter;
     }
 
     @Override
@@ -212,7 +212,7 @@ public synchronized void setInvocationCount(int invocationCount){
         if(invocationCount < 0){
             throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
         }
-        this.invocationCount = invocationCount;
+        this.trainInvocationCounter = invocationCount;
     }
 
     @Override
diff --git a/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionSparseTrainer.java b/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionSparseTrainer.java
index 8d7c8e6f5..a671f35ae 100644
--- a/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionSparseTrainer.java
+++ b/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionSparseTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,14 +131,9 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        trainInvocationCounter = 0;
-
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-            trainInvocationCounter++;
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
         }
-
     }
 
     /**
diff --git a/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionTrainer.java b/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionTrainer.java
index 8c406244a..b1da5492f 100644
--- a/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionTrainer.java
+++ b/Regression/Core/src/main/java/org/tribuo/regression/impl/SkeletalIndependentRegressionTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,12 +74,20 @@ public SkeletalIndependentRegressionModel train(Dataset<Regressor> examples) {
 
     @Override
     public SkeletalIndependentRegressionModel train(Dataset<Regressor> examples, Map<String, Provenance> runProvenance) {
+        return train(examples, runProvenance, INCREMENT_INVOCATION_COUNT);
+    }
+
+    @Override
+    public SkeletalIndependentRegressionModel train(Dataset<Regressor> examples, Map<String, Provenance> runProvenance, int invocationCount) {
         if (examples.getOutputInfo().getUnknownCount() > 0) {
             throw new IllegalArgumentException("The supplied Dataset contained unknown Outputs, and this Trainer is supervised.");
         }
         SplittableRandom localRNG;
         TrainerProvenance trainerProvenance;
         synchronized(this) {
+            if(invocationCount != INCREMENT_INVOCATION_COUNT) {
+                setInvocationCount(invocationCount);
+            }
             localRNG = rng.split();
             trainerProvenance = getProvenance();
             trainInvocationCounter++;
@@ -117,6 +125,18 @@ public int getInvocationCount() {
         return trainInvocationCounter;
     }
 
+    @Override
+    public synchronized void setInvocationCount(int invocationCount){
+        if(invocationCount < 0){
+            throw new IllegalArgumentException("The supplied invocationCount is less than zero.");
+        }
+
+        rng = new SplittableRandom(seed);
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
+        }
+    }
+
     /**
      * Constructs the appropriate subclass of {@link SkeletalIndependentRegressionModel} for this trainer.
      * @param models The models to use.
diff --git a/Regression/RegressionTree/src/main/java/org/tribuo/regression/rtree/CARTRegressionTrainer.java b/Regression/RegressionTree/src/main/java/org/tribuo/regression/rtree/CARTRegressionTrainer.java
index 9a1d20743..fa29b2863 100644
--- a/Regression/RegressionTree/src/main/java/org/tribuo/regression/rtree/CARTRegressionTrainer.java
+++ b/Regression/RegressionTree/src/main/java/org/tribuo/regression/rtree/CARTRegressionTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/Regression/SGD/src/test/java/org/tribuo/regression/sgd/linear/TestSGDLinear.java b/Regression/SGD/src/test/java/org/tribuo/regression/sgd/linear/TestSGDLinear.java
index 6d62f3cc1..a5cedabd2 100644
--- a/Regression/SGD/src/test/java/org/tribuo/regression/sgd/linear/TestSGDLinear.java
+++ b/Regression/SGD/src/test/java/org/tribuo/regression/sgd/linear/TestSGDLinear.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -247,7 +247,7 @@ public void testSetInvocationCount() {
 
         // The number of times to call train before final training.
         // Original trainer will be trained numOfInvocations + 1 times
-        // New trainer will have it's invocation count set to numOfInvocations then trained once
+        // New trainer will have its invocation count set to numOfInvocations then trained once
         int numOfInvocations = 2;
 
         // Create the first model and train it numOfInvocations + 1 times
diff --git a/Regression/SLM/src/main/java/org/tribuo/regression/slm/ElasticNetCDTrainer.java b/Regression/SLM/src/main/java/org/tribuo/regression/slm/ElasticNetCDTrainer.java
index 4ba311283..af36209de 100644
--- a/Regression/SLM/src/main/java/org/tribuo/regression/slm/ElasticNetCDTrainer.java
+++ b/Regression/SLM/src/main/java/org/tribuo/regression/slm/ElasticNetCDTrainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2021, Oracle and/or its affiliates. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -360,14 +360,9 @@ public synchronized void setInvocationCount(int invocationCount){
         }
 
         rng = new SplittableRandom(seed);
-        SplittableRandom localRNG;
-        trainInvocationCounter = 0;
-
-        for (int invocationCounter = 0; invocationCounter < invocationCount; invocationCounter++){
-            localRNG = rng.split();
-            trainInvocationCounter++;
+        for (trainInvocationCounter = 0; trainInvocationCounter < invocationCount; trainInvocationCounter++){
+            SplittableRandom localRNG = rng.split();
         }
-
     }
 
     @Override
diff --git a/Regression/SLM/src/test/java/org/tribuo/regression/slm/TestSLM.java b/Regression/SLM/src/test/java/org/tribuo/regression/slm/TestSLM.java
index 07022b58a..0a3d26582 100644
--- a/Regression/SLM/src/test/java/org/tribuo/regression/slm/TestSLM.java
+++ b/Regression/SLM/src/test/java/org/tribuo/regression/slm/TestSLM.java
@@ -244,7 +244,7 @@ public void testSetInvocationCount() {
 
         // The number of times to call train before final training.
         // Original trainer will be trained numOfInvocations + 1 times
-        // New trainer will have it's invocation count set to numOfInvocations then trained once
+        // New trainer will have its invocation count set to numOfInvocations then trained once
         int numOfInvocations = 2;
 
         // Create the first model and train it numOfInvocations + 1 times
@@ -264,7 +264,6 @@ public void testSetInvocationCount() {
         // had trained numOfInvocations times previously even though it hasn't
         SparseModel<Regressor> newModel = newTrainer.train(p.getA());
         assertEquals(originalTrainer.getInvocationCount(),newTrainer.getInvocationCount());
-
     }
 
     @Test