diff --git a/app/build.gradle b/app/build.gradle
index f715772..419ee1f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,4 +46,10 @@ dependencies {
 task bindLibrary(type: Exec) {
     workingDir "$projectDir"
     commandLine 'sh', '-c', './bind.sh ' + project.ext.boxcarsVersion
-}
\ No newline at end of file
+}
+
+afterEvaluate {
+    android.applicationVariants.all { variant ->
+        variant.javaCompiler.dependsOn(bindLibrary)
+    }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0608d92..bcac592 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:launchMode="singleInstance"
             android:screenOrientation="sensorLandscape"
             android:exported="true">
             <intent-filter>
@@ -23,4 +24,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>