diff --git a/app/build.gradle b/app/build.gradle
index 027be81..759891a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,11 +60,13 @@ ext {
      * Libraries
      ********************
      */
-    kotlin_coroutines_version = "1.5.1"
+    kotlin_coroutines_version = "1.5.2"
     espresso_version = "3.4.0"
     mockito_version = "3.11.2"
+    junit_jupiter_version = "5.8.1"
     fragment_version = "1.3.1"
-    compose_version = "1.0.0"
+    compose_version = "1.0.4"
+    accompanist_version = "0.20.0"
 }
 
 android {
@@ -201,18 +203,18 @@ dependencies {
 
     // AndroidX dependencies
     implementation "androidx.appcompat:appcompat:1.3.1"
-    implementation "androidx.core:core-ktx:1.6.0"
+    implementation "androidx.core:core-ktx:1.7.0"
 
     // Jetpack Compose
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-util:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation "androidx.activity:activity-compose:1.3.0"
+    implementation "androidx.activity:activity-compose:1.4.0"
 
     // Accompanist
-    implementation "com.google.accompanist:accompanist-pager:0.15.0"
-    implementation "com.google.accompanist:accompanist-pager-indicators:0.15.0"
+    implementation "com.google.accompanist:accompanist-pager:$accompanist_version"
+    implementation "com.google.accompanist:accompanist-pager-indicators:$accompanist_version"
 
     // Misc
     implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0"
@@ -222,13 +224,13 @@ dependencies {
 
     // Testing
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    testImplementation "org.mockito:mockito-core:3.12.4"
+    testImplementation "org.mockito:mockito-core:4.0.0"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
 
     // Use jUnit5 in unit tests
     testImplementation "junit:junit:4.13.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.2"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.2"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_jupiter_version"
 
     androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
 
diff --git a/app/src/main/kotlin/com/adriangl/pict2cam/ui/components/OnboardingPager.kt b/app/src/main/kotlin/com/adriangl/pict2cam/ui/components/OnboardingPager.kt
index 66c14bb..818f88b 100644
--- a/app/src/main/kotlin/com/adriangl/pict2cam/ui/components/OnboardingPager.kt
+++ b/app/src/main/kotlin/com/adriangl/pict2cam/ui/components/OnboardingPager.kt
@@ -139,13 +139,13 @@ fun OnboardingPage(onboardingPageInfo: OnboardingPageInfo) {
 @Suppress("UndocumentedPublicFunction")
 fun OnboardingPager(onboardingPages: List<OnboardingPageInfo>,
                     onExitClick: () -> Unit = {}) {
-    val pagerState = rememberPagerState(pageCount = onboardingPages.size)
+    val pagerState = rememberPagerState(0)
     val coroutineScope = rememberCoroutineScope()
 
     fun isLastPage() = pagerState.currentPage == onboardingPages.size - 1
 
     Box(modifier = Modifier.fillMaxSize()) {
-        HorizontalPager(state = pagerState) { page ->
+        HorizontalPager(state = pagerState, count = onboardingPages.size) { page ->
             OnboardingPage(onboardingPages[page])
         }
 
diff --git a/build.gradle b/build.gradle
index f7dc535..3c82370 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ apply plugin: "com.github.ben-manes.versions"
 
 buildscript {
     ext {
-        kotlin_version = "1.5.10" // Forced by Jetpack Compose 1.0.0
+        kotlin_version = "1.5.31" // Forced by Jetpack Compose 1.0.4
         detekt_version = "1.18.1"
     }
 
@@ -32,14 +32,14 @@ buildscript {
     }
     
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath "com.android.tools.build:gradle:7.0.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-formatting:$detekt_version"
         classpath "com.gladed.androidgitversion:gradle-android-git-version:0.4.14"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.39.0"
-        classpath "com.github.hyperdevs-team:poeditor-android-gradle-plugin:2.4.0"
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1"
+        classpath "com.github.hyperdevs-team:poeditor-android-gradle-plugin:2.4.2"
+        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.8.0.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files