diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/AlertDialog.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/AlertDialog.kt
index 8bb58343..aa58ee20 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/AlertDialog.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/AlertDialog.kt
@@ -11,7 +11,7 @@ suspend inline fun <T : Any> alertDialog(
 	context: Context,
 	crossinline build: AlertDialog.Builder.(resume: (T?) -> Unit) -> Unit
 ): T? = withContext(Dispatchers.Main) {
-	suspendCoroutine<T?> { continuation ->
+	suspendCoroutine { continuation ->
 		AlertDialog.Builder(context).apply {
 			setOnCancelListener {
 				continuation.resume(null)
diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/Locale.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/Locale.kt
index adf5ff10..b8c43218 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/Locale.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/app/Locale.kt
@@ -5,21 +5,22 @@ import android.os.Build
 import java.util.*
 
 fun Context.applyLocale(localeName: String) {
-	if (localeName.isNotEmpty()) {
-		val localeParts = localeName.split("-")
-		val locale = if (localeParts.size == 2) {
-			Locale(localeParts[0], localeParts[1])
-		} else {
-			Locale(localeName)
-		}
-		Locale.setDefault(locale)
-		val conf = resources.configuration
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-			@Suppress("DEPRECATION")
-			conf.locale = locale
-		} else {
-			conf.setLocale(locale)
-		}
-		resources.updateConfiguration(conf, resources.displayMetrics)
+	if (localeName.isEmpty()) {
+		return
 	}
+	val localeParts = localeName.split("-")
+	val locale = if (localeParts.size == 2) {
+		Locale(localeParts[0], localeParts[1])
+	} else {
+		Locale(localeName)
+	}
+	Locale.setDefault(locale)
+	val conf = resources.configuration
+	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+		@Suppress("DEPRECATION")
+		conf.locale = locale
+	} else {
+		conf.setLocale(locale)
+	}
+	resources.updateConfiguration(conf, resources.displayMetrics)
 }
diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/database/CsvExport.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/database/CsvExport.kt
index 55f5b83f..902f29eb 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/database/CsvExport.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/database/CsvExport.kt
@@ -16,7 +16,7 @@ fun exportCsv(
 	exportCsv(outputStream, cursor, delimiter)
 }
 
-fun exportCsv(cursor: Cursor, delimiter: String): String? {
+fun exportCsv(cursor: Cursor, delimiter: String): String {
 	val outputStream = ByteArrayOutputStream()
 	exportCsv(outputStream, cursor, delimiter)
 	return outputStream.toString()
diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt
index 45c39cce..3e934a30 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt
@@ -273,4 +273,4 @@ private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) {
 
 private val fileNameCharacters = "[^A-Za-z0-9]".toRegex()
 private fun encodeFileName(name: String): String =
-	fileNameCharacters.replace(name, "_").take(16).trim('_').toLowerCase(Locale.getDefault())
+	fileNameCharacters.replace(name, "_").take(16).trim('_').lowercase(Locale.getDefault())
diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/DecodeFragment.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/DecodeFragment.kt
index 6351b473..886769d0 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/DecodeFragment.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/DecodeFragment.kt
@@ -349,7 +349,7 @@ private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	while (true) {
 		val ord = bytes[i]
 		hex.append(String.format("%02X ", ord))
-		ascii.append(if (ord > 31) ord.toChar() else " ")
+		ascii.append(if (ord > 31) ord.toInt().toChar() else " ")
 		++i
 		val posInLine = i % itemsPerLine
 		val atEnd = i >= len
diff --git a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/PreferencesFragment.kt b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/PreferencesFragment.kt
index 087a8471..9a9728c0 100644
--- a/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/PreferencesFragment.kt
+++ b/app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/PreferencesFragment.kt
@@ -51,7 +51,7 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
 			pref.isVisible = false
 		} else {
-			pref.setOnPreferenceClickListener { _ ->
+			pref.setOnPreferenceClickListener {
 				askToClearNetworkSuggestions(context)
 				true
 			}