diff --git a/math-scala/src/main/scala/org/apache/mahout/math/cf/SimilarityAnalysis.scala b/math-scala/src/main/scala/org/apache/mahout/math/cf/SimilarityAnalysis.scala
index b8d90412e9..f69bf8113d 100644
--- a/math-scala/src/main/scala/org/apache/mahout/math/cf/SimilarityAnalysis.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/math/cf/SimilarityAnalysis.scala
@@ -320,6 +320,8 @@ object SimilarityAnalysis extends Serializable {
 
     //val minLLR = minLLROpt.getOrElse(0.0d) // accept all values if not specified
 
+    val minLLR = minLLROpt
+
     drm.mapBlock() {
       case (keys, block) =>
 
@@ -351,7 +353,7 @@ object SimilarityAnalysis extends Serializable {
               // val candidate = thingA -> normailizedLLR
 
               // Enqueue item with score, if belonging to the top-k
-              if(minLLROpt.nonEmpty && candidate._2 >= minLLROpt.get) {//llr threshold takes precedence over max per row
+              if(minLLR.isEmpty || llr >= minLLR.get) { // llr threshold takes precedence over max per row
                 if (topItemsPerThing.size < maxInterestingItemsPerThing) {
                   topItemsPerThing.enqueue(candidate)
                 } else if (orderByScore.lt(candidate, topItemsPerThing.head)) {
diff --git a/spark/src/main/scala/org/apache/mahout/sparkbindings/io/MahoutKryoRegistrator.scala b/spark/src/main/scala/org/apache/mahout/sparkbindings/io/MahoutKryoRegistrator.scala
index 2afea8aa83..b7d36edf1b 100644
--- a/spark/src/main/scala/org/apache/mahout/sparkbindings/io/MahoutKryoRegistrator.scala
+++ b/spark/src/main/scala/org/apache/mahout/sparkbindings/io/MahoutKryoRegistrator.scala
@@ -57,7 +57,8 @@ object MahoutKryoRegistrator {
       Class.forName(classOf[DenseVector].getName + "$DenseVectorView"),
       // This is supported by twitter.chill, but kryo still is offended by lack of registration:
       classOf[Range],
-      classOf[Unit],
+      //classOf[Unit], // this causes an error with "void not serializable" or some such on a real cluster. Not found
+      // in unit tests
       classOf[scala.collection.mutable.WrappedArray.ofRef[_]],
       classOf[Array[Int]],
       classOf[Array[String]]