diff --git a/build.gradle b/build.gradle
index 14c385b8..f5b46030 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,18 +128,23 @@ android {
 		}
 	}
 	buildFeatures {
-		renderScript false
 		aidl true
+		buildConfig true
+		renderScript false
 	}
 
 
 	applicationVariants.configureEach { variant ->
-		tasks["generate${variant.name.capitalize()}Assets"]
-			.dependsOn(validateLanguages)
-			.dependsOn(copyLanguages)
-			.dependsOn(calculateDictionarySizes)
+		tasks.named("generate${variant.name.capitalize()}Assets")?.configure {
+			dependsOn(validateLanguages, copyLanguages, calculateDictionarySizes)
+		}
 
-		tasks.findByName('lintVitalAnalyzeRelease')?.mustRunAfter(copyLanguages)?.mustRunAfter(calculateDictionarySizes)
-		tasks.findByName('lintAnalyzeDebug')?.mustRunAfter(copyLanguages)?.mustRunAfter(calculateDictionarySizes)
+		tasks.named("lintAnalyzeDebug")?.configure {
+			mustRunAfter(copyLanguages, calculateDictionarySizes)
+		}
+
+		tasks.named("lintVitalAnalyzeRelease")?.configure {
+			mustRunAfter(copyLanguages, calculateDictionarySizes)
+		}
 	}
 }
diff --git a/gradle.properties b/gradle.properties
index 753567c4..6469e575 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,6 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Wed May 17 11:42:52 EEST 2023
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=true
 android.nonTransitiveRClass=true
 android.useAndroidX=true
diff --git a/gradle/scripts/validate-languages.gradle b/gradle/scripts/validate-languages.gradle
index 39de519c..854b56c6 100644
--- a/gradle/scripts/validate-languages.gradle
+++ b/gradle/scripts/validate-languages.gradle
@@ -145,10 +145,10 @@ static def parseDictionaryFile(String alphabet, File dictionaryFile, int MAX_ERR
 
 			String[] parts = line.split(CSV_DELIMITER, 2)
 			String word = parts[0]
-			int frequency;
+			int frequency
 			try {
 				frequency = (parts.length > 1 ? parts[1] : "0") as int
-			} catch (Exception e) {
+			} catch (Exception ignored) {
 				frequency = -1
 			}