diff --git a/lib/src/main/java/com/smileidentity/models/JobStatus.kt b/lib/src/main/java/com/smileidentity/models/JobStatus.kt
index 68cc72035..2cf0ec06d 100644
--- a/lib/src/main/java/com/smileidentity/models/JobStatus.kt
+++ b/lib/src/main/java/com/smileidentity/models/JobStatus.kt
@@ -46,25 +46,25 @@ data class SmartSelfieJobStatusResponse(
 
 @Parcelize
 @JsonClass(generateAdapter = true)
-data class DocumentVerificationJobStatusResponse(
+data class BiometricKycJobStatusResponse(
     @Json(name = "timestamp") override val timestamp: String,
     @Json(name = "job_complete") override val jobComplete: Boolean,
     @Json(name = "job_success") override val jobSuccess: Boolean,
     @Json(name = "code") override val code: String,
-    @Json(name = "result") override val result: DocumentVerificationJobResult?,
-    @Json(name = "history") override val history: List<DocumentVerificationJobResult.Entry>?,
+    @Json(name = "result") override val result: BiometricKycJobResult?,
+    @Json(name = "history") override val history: List<BiometricKycJobResult.Entry>?,
     @Json(name = "image_links") override val imageLinks: ImageLinks?,
 ) : JobStatusResponse
 
 @Parcelize
 @JsonClass(generateAdapter = true)
-data class BiometricKycJobStatusResponse(
+data class DocumentVerificationJobStatusResponse(
     @Json(name = "timestamp") override val timestamp: String,
     @Json(name = "job_complete") override val jobComplete: Boolean,
     @Json(name = "job_success") override val jobSuccess: Boolean,
     @Json(name = "code") override val code: String,
-    @Json(name = "result") override val result: BiometricKycJobResult?,
-    @Json(name = "history") override val history: List<BiometricKycJobResult.Entry>?,
+    @Json(name = "result") override val result: DocumentVerificationJobResult?,
+    @Json(name = "history") override val history: List<DocumentVerificationJobResult.Entry>?,
     @Json(name = "image_links") override val imageLinks: ImageLinks?,
 ) : JobStatusResponse
 
diff --git a/lib/src/main/java/com/smileidentity/viewmodel/BiometricKycViewModel.kt b/lib/src/main/java/com/smileidentity/viewmodel/BiometricKycViewModel.kt
index da23c9fed..c76f2c05b 100644
--- a/lib/src/main/java/com/smileidentity/viewmodel/BiometricKycViewModel.kt
+++ b/lib/src/main/java/com/smileidentity/viewmodel/BiometricKycViewModel.kt
@@ -92,7 +92,6 @@ class BiometricKycViewModel(
             val authResponse = SmileID.api.authenticate(authRequest)
 
             val prepUploadRequest = PrepUploadRequest(
-                callbackUrl = SmileID.callbackUrl,
                 partnerParams = authResponse.partnerParams,
                 signature = authResponse.signature,
                 timestamp = authResponse.timestamp,
diff --git a/lib/src/main/java/com/smileidentity/viewmodel/SelfieViewModel.kt b/lib/src/main/java/com/smileidentity/viewmodel/SelfieViewModel.kt
index a0b81ccfb..c5ccd78d1 100644
--- a/lib/src/main/java/com/smileidentity/viewmodel/SelfieViewModel.kt
+++ b/lib/src/main/java/com/smileidentity/viewmodel/SelfieViewModel.kt
@@ -274,7 +274,6 @@ class SelfieViewModel(
             val authResponse = SmileID.api.authenticate(authRequest)
 
             val prepUploadRequest = PrepUploadRequest(
-                callbackUrl = SmileID.callbackUrl,
                 partnerParams = authResponse.partnerParams,
                 signature = authResponse.signature,
                 timestamp = authResponse.timestamp,
diff --git a/lib/src/main/java/com/smileidentity/viewmodel/document/OrchestratedDocumentViewModel.kt b/lib/src/main/java/com/smileidentity/viewmodel/document/OrchestratedDocumentViewModel.kt
index 52174dbe1..b5e2d47ce 100644
--- a/lib/src/main/java/com/smileidentity/viewmodel/document/OrchestratedDocumentViewModel.kt
+++ b/lib/src/main/java/com/smileidentity/viewmodel/document/OrchestratedDocumentViewModel.kt
@@ -134,7 +134,6 @@ internal abstract class OrchestratedDocumentViewModel<T : Parcelable>(
             val authResponse = SmileID.api.authenticate(authRequest)
 
             val prepUploadRequest = PrepUploadRequest(
-                callbackUrl = SmileID.callbackUrl,
                 partnerParams = authResponse.partnerParams,
                 signature = authResponse.signature,
                 timestamp = authResponse.timestamp,
diff --git a/sample/src/main/java/com/smileidentity/sample/compose/components/IdTypeSelectorAndFieldInputScreen.kt b/sample/src/main/java/com/smileidentity/sample/compose/components/IdTypeSelectorAndFieldInputScreen.kt
index c37a49717..43f52646c 100644
--- a/sample/src/main/java/com/smileidentity/sample/compose/components/IdTypeSelectorAndFieldInputScreen.kt
+++ b/sample/src/main/java/com/smileidentity/sample/compose/components/IdTypeSelectorAndFieldInputScreen.kt
@@ -54,7 +54,7 @@ fun IdTypeSelectorAndFieldInputScreen(
 
         !uiState.hasIdTypeSelectionBeenConfirmed -> IdSelectorScreen(
             modifier = modifier,
-            onNext = { viewModel.onIdTypeConfirmed() },
+            onNext = viewModel::onIdTypeConfirmed,
         )
 
         else -> IdInputScreen(
diff --git a/sample/src/main/java/com/smileidentity/sample/viewmodel/IdTypeSelectorAndFieldInputViewModel.kt b/sample/src/main/java/com/smileidentity/sample/viewmodel/IdTypeSelectorAndFieldInputViewModel.kt
index f7c75aeeb..a9bf6f540 100644
--- a/sample/src/main/java/com/smileidentity/sample/viewmodel/IdTypeSelectorAndFieldInputViewModel.kt
+++ b/sample/src/main/java/com/smileidentity/sample/viewmodel/IdTypeSelectorAndFieldInputViewModel.kt
@@ -71,7 +71,6 @@ class IdTypeSelectorAndFieldInputViewModel(
             )
             val authResponse = SmileID.api.authenticate(authRequest)
             val productsConfigRequest = ProductsConfigRequest(
-                partnerId = SmileID.config.partnerId,
                 timestamp = authResponse.timestamp,
                 signature = authResponse.signature,
             )