diff --git a/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/OcsModule.kt b/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/OcsModule.kt
index bd8051836..37870500f 100644
--- a/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/OcsModule.kt
+++ b/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/OcsModule.kt
@@ -13,6 +13,7 @@ import org.ostelco.prime.ocs.consumption.pubsub.PubSubClient
 import org.ostelco.prime.ocs.core.OnlineCharging
 
 @JsonTypeName("ocs")
+@ExperimentalUnsignedTypes
 class OcsModule : PrimeModule {
 
     @JsonProperty
@@ -46,11 +47,6 @@ class OcsModule : PrimeModule {
     }
 }
 
-data class Rate(
-        val serviceId: Long,
-        val ratingGroup: Long,
-        val rate: String)
-
 data class PubSubChannel(
         val projectId: String,
         val activateTopicId: String,
diff --git a/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/core/OnlineCharging.kt b/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/core/OnlineCharging.kt
index 2f19e77df..909704ff4 100644
--- a/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/core/OnlineCharging.kt
+++ b/ocs-ktc/src/main/kotlin/org/ostelco/prime/ocs/core/OnlineCharging.kt
@@ -91,7 +91,7 @@ object OnlineCharging : OcsAsyncRequestConsumer {
         }
     }
 
-    private fun sendCreditControlAnswer(returnCreditControlAnswer: (CreditControlAnswerInfo) -> kotlin.Unit,
+    private fun sendCreditControlAnswer(returnCreditControlAnswer: (CreditControlAnswerInfo) -> Unit,
                                         responseBuilder: CreditControlAnswerInfo.Builder) {
         synchronized(OnlineCharging) {
             returnCreditControlAnswer(responseBuilder.build())
@@ -144,7 +144,7 @@ object OnlineCharging : OcsAsyncRequestConsumer {
                         sgsnMccMnc = getUserLocationMccMnc(request),
                         apn = request.serviceInformation.psInformation.calledStationId,
                         imsiMccMnc = request.serviceInformation.psInformation.imsiMccMnc)
-                        .bimap(
+                        .fold(
                                 { consumptionResult -> consumptionResultHandler(consumptionResult) },
                                 { consumptionRequest ->  consumeRequestHandler(consumptionRequest) }
                         )
diff --git a/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/grpc/OcsGrpcServerTest.kt b/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/grpc/OcsGrpcServerTest.kt
index 208ecc1bd..14bf18bbd 100644
--- a/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/grpc/OcsGrpcServerTest.kt
+++ b/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/grpc/OcsGrpcServerTest.kt
@@ -18,6 +18,7 @@ import java.util.concurrent.CountDownLatch
 import kotlin.system.measureTimeMillis
 import kotlin.test.AfterTest
 
+@ExperimentalUnsignedTypes
 class OcsGrpcServerTest {
 
     private lateinit var server: OcsGrpcServer
diff --git a/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/pubsub/OcsPubSubTest.kt b/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/pubsub/OcsPubSubTest.kt
index 8da50bfb7..c30725495 100644
--- a/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/pubsub/OcsPubSubTest.kt
+++ b/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/consumption/pubsub/OcsPubSubTest.kt
@@ -27,6 +27,7 @@ private const val CCR_SUBSCRIPTION = "ocs-ccr-sub"
 private const val CCA_SUBSCRIPTION = "ocsgw-cca-sub"
 private const val ACTIVATE_SUBSCRIPTION = "ocsgw-activate-sub"
 
+@ExperimentalUnsignedTypes
 class OcsPubSubTest {
 
     private val logger by getLogger()
diff --git a/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/core/OnlineChargingTest.kt b/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/core/OnlineChargingTest.kt
index 3b86f9bf9..027bbb6f4 100644
--- a/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/core/OnlineChargingTest.kt
+++ b/ocs-ktc/src/test/kotlin/org/ostelco/prime/ocs/core/OnlineChargingTest.kt
@@ -13,6 +13,7 @@ import java.util.concurrent.CountDownLatch
 import kotlin.system.measureTimeMillis
 import kotlin.test.fail
 
+@ExperimentalUnsignedTypes
 class OnlineChargingTest {
 
     @Ignore