diff --git a/qr/app/src/main/AndroidManifest.xml b/qr/app/src/main/AndroidManifest.xml
index e6dda092b..3a8aa2c4e 100644
--- a/qr/app/src/main/AndroidManifest.xml
+++ b/qr/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:theme="@style/Theme.App">
 
         <activity
-            android:name=".MainActivity"
+            android:name=".QrMainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/qr/app/src/main/java/org/signal/qrtest/MainActivity.kt b/qr/app/src/main/java/org/signal/qrtest/QrMainActivity.kt
similarity index 94%
rename from qr/app/src/main/java/org/signal/qrtest/MainActivity.kt
rename to qr/app/src/main/java/org/signal/qrtest/QrMainActivity.kt
index d56145eae..72d91c176 100644
--- a/qr/app/src/main/java/org/signal/qrtest/MainActivity.kt
+++ b/qr/app/src/main/java/org/signal/qrtest/QrMainActivity.kt
@@ -8,7 +8,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import org.signal.qr.QrScannerView
 
-class MainActivity : AppCompatActivity() {
+class QrMainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
diff --git a/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt b/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt
index a720ec181..579845a49 100644
--- a/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt
+++ b/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt
@@ -36,7 +36,7 @@ class QrProcessor {
       val source = PlanarYUVLuminanceSource(data, width, height, 0, 0, width, height, false)
 
       val bitmap = BinaryBitmap(HybridBinarizer(source))
-      val result: Result? = reader.decode(bitmap, emptyMap<DecodeHintType, String>())
+      val result: Result? = reader.decode(bitmap, mapOf(DecodeHintType.TRY_HARDER to true, DecodeHintType.CHARACTER_SET to "ISO-8859-1"))
 
       if (result != null) {
         return result.text
diff --git a/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt b/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt
index e329ded1e..8b563120f 100644
--- a/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt
+++ b/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt
@@ -74,12 +74,12 @@ internal class ScannerView21 constructor(
     val preview = Preview.Builder().build()
 
     val imageAnalysis = ImageAnalysis.Builder()
-      .setTargetAspectRatio(AspectRatio.RATIO_16_9)
+      .setTargetAspectRatio(AspectRatio.RATIO_4_3)
       .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
       .build()
 
     imageAnalysis.setAnalyzer(analyzerExecutor) { proxy ->
-      val buffer = proxy.planes[0].buffer
+      val buffer = proxy.planes[0].buffer.apply { rewind() }
       val bytes = ByteArray(buffer.capacity())
       buffer.get(bytes)