diff --git a/app/build.gradle b/app/build.gradle
index 35055902..d8b701e3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,13 +10,12 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "com.simplemobiletools.contacts.pro"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 81
         versionName "6.14.2"
         setProperty("archivesBaseName", "contacts")
@@ -57,7 +56,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.34.7'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:11624254b2'
     implementation 'joda-time:joda-time:2.10.3'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
     implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
index 66482c12..6239557c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
@@ -633,7 +633,7 @@ class ContactsHelper(val context: Context) {
 
         try {
             val results = context.contentResolver.applyBatch(AUTHORITY, operations)
-            val rawId = ContentUris.parseId(results[0].uri)
+            val rawId = ContentUris.parseId(results[0].uri!!)
             return Group(rawId, title)
         } catch (e: Exception) {
             context.showErrorToast(e)
@@ -1340,7 +1340,7 @@ class ContactsHelper(val context: Context) {
             }
 
             // fullsize photo
-            val rawId = ContentUris.parseId(results[0].uri)
+            val rawId = ContentUris.parseId(results[0].uri!!)
             if (contact.photoUri.isNotEmpty() && fullSizePhotoData != null) {
                 addFullSizePhoto(rawId, fullSizePhotoData)
             }
diff --git a/build.gradle b/build.gradle
index dda97187..ac335a39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.4.32'
 
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong