diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
index fb50e11b5..96a6c1484 100644
--- a/android-project/app/build.gradle
+++ b/android-project/app/build.gradle
@@ -16,7 +16,7 @@ android {
         if (buildAsApplication) {
             applicationId "org.diasurgical.devilutionx"
         }
-        minSdkVersion 21
+        minSdkVersion 18
         targetSdkVersion 29 // Upgrade to 30 after november 2021
         versionCode 18
         versionName "1.2.1"
diff --git a/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java b/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java
index a7d3f4633..b492c6508 100644
--- a/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java
+++ b/android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java
@@ -72,23 +72,28 @@ public class DevilutionXSDLActivity extends SDLActivity {
 
 	private boolean copyFile(File src, File dst) {
 		try {
-			try (InputStream in = new FileInputStream(src)) {
-				try (OutputStream out = new FileOutputStream(dst)) {
+			InputStream in = new FileInputStream(src);
+			try {
+				OutputStream out = new FileOutputStream(dst);
+				try {
 					// Transfer bytes from in to out
 					byte[] buf = new byte[1024];
 					int len;
 					while ((len = in.read(buf)) > 0) {
 						out.write(buf, 0, len);
 					}
-
-					return true;
+				} finally {
+					out.close();
 				}
+			} finally {
+				in.close();
 			}
 		} catch (IOException exception) {
 			Log.e("copyFile", exception.getMessage());
+			return false;
 		}
 
-		return false;
+		return  true;
 	}
 
 	private void migrateFile(File file) {
diff --git a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
index c9212e995..5899817f6 100644
--- a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -104,7 +104,6 @@ public class HIDDeviceManager {
     private HIDDeviceManager(final Context context) {
         mContext = context;
 
-/*
         // Make sure we have the HIDAPI library loaded with the native functions
         try {
             SDL.loadLibrary("hidapi");
@@ -134,7 +133,6 @@ public class HIDDeviceManager {
 
             return;
         }
-*/
         
         HIDDeviceRegisterCallback();