diff --git a/ble/src/main/java/no/nordicsemi/android/ble/Request.java b/ble/src/main/java/no/nordicsemi/android/ble/Request.java
index a6f05dbf..a9da4d68 100644
--- a/ble/src/main/java/no/nordicsemi/android/ble/Request.java
+++ b/ble/src/main/java/no/nordicsemi/android/ble/Request.java
@@ -100,8 +100,8 @@ enum Type {
 		SLEEP,
 	}
 
-	protected RequestHandler requestHandler;
-	protected CallbackHandler handler;
+	RequestHandler requestHandler;
+	CallbackHandler handler;
 
 	final ConditionVariable syncLock;
 	final Type type;
diff --git a/examples/trivia/src/main/java/no/nordicsemi/android/ble/trivia/client/viewmodel/ClientViewModel.kt b/examples/trivia/src/main/java/no/nordicsemi/android/ble/trivia/client/viewmodel/ClientViewModel.kt
index 8b7bf1fc..57d60a26 100644
--- a/examples/trivia/src/main/java/no/nordicsemi/android/ble/trivia/client/viewmodel/ClientViewModel.kt
+++ b/examples/trivia/src/main/java/no/nordicsemi/android/ble/trivia/client/viewmodel/ClientViewModel.kt
@@ -12,13 +12,12 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import no.nordicsemi.android.ble.ktx.state.ConnectionState
+import no.nordicsemi.android.ble.ktx.stateAsFlow
 import no.nordicsemi.android.ble.trivia.client.data.ClientViewState
 import no.nordicsemi.android.ble.trivia.client.repository.ClientConnection
 import no.nordicsemi.android.ble.trivia.client.repository.ScannerRepository
 import no.nordicsemi.android.ble.trivia.server.viewmodel.Timer
 import no.nordicsemi.android.ble.trivia.server.viewmodel.TimerViewModel
-import no.nordicsemi.android.ble.ktx.stateAsFlow
 import javax.inject.Inject
 
 @HiltViewModel
@@ -47,7 +46,7 @@ class ClientViewModel @Inject constructor(
                     error
                         .onEach { _clientState.value = _clientState.value.copy(nameResult = it) }
                         .launchIn(viewModelScope)
-                     userJoined
+                    userJoined
                         .onEach { _clientState.value = _clientState.value.copy(userJoined = it) }
                         .launchIn(viewModelScope)
                     question