diff --git a/clouddriver-saga-test/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/TestingSagaRepository.kt b/clouddriver-saga-test/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/TestingSagaRepository.kt
index f79c279ed43..85730165115 100644
--- a/clouddriver-saga-test/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/TestingSagaRepository.kt
+++ b/clouddriver-saga-test/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/TestingSagaRepository.kt
@@ -35,7 +35,7 @@ class TestingSagaRepository : SagaRepository {
   override fun save(saga: Saga, additionalEvents: List<SagaEvent>) {
     sagas.putIfAbsent(createId(saga), saga)
 
-    val currentSequence = saga.getEvents().map { it.getMetadata().sequence }.max() ?: 0
+    val currentSequence = saga.getEvents().map { it.getMetadata().sequence }.maxOrNull() ?: 0
     val originatingVersion = saga.getVersion()
 
     saga.getPendingEvents()
diff --git a/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/flow/SagaFlowIterator.kt b/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/flow/SagaFlowIterator.kt
index abd0daaa339..7248cc7baf7 100644
--- a/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/flow/SagaFlowIterator.kt
+++ b/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/flow/SagaFlowIterator.kt
@@ -182,7 +182,7 @@ class SagaFlowIterator(
 
     index = listOf(SagaCommandCompletedEventSeeker(), SagaCommandEventSeeker())
       .mapNotNull { it.invoke(index, steps, saga)?.coerceAtLeast(0) }
-      .min()
+      .minOrNull()
       ?: index
 
     if (index != 0) {
diff --git a/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/models/Saga.kt b/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/models/Saga.kt
index d88cd7879b9..10ddbd4be43 100644
--- a/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/models/Saga.kt
+++ b/clouddriver-saga/src/main/kotlin/com/netflix/spinnaker/clouddriver/saga/models/Saga.kt
@@ -59,7 +59,7 @@ class Saga(
   fun isCompensating(): Boolean = events.filterIsInstance<SagaRollbackStarted>().isNotEmpty()
 
   fun getVersion(): Long {
-    return events.map { it.getMetadata().originatingVersion }.max()?.let { it + 1 } ?: 0
+    return events.map { it.getMetadata().originatingVersion }.maxOrNull()?.let { it + 1 } ?: 0
   }
 
   fun addEvent(event: SagaEvent) {