diff --git a/.github/workflows/apk_main.yml b/.github/workflows/apk_main.yml
index fc6e5370b..5b6984209 100644
--- a/.github/workflows/apk_main.yml
+++ b/.github/workflows/apk_main.yml
@@ -15,9 +15,10 @@ jobs:
       - uses: ./.github/actions/checkout_submodules
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 17
+          distribution: 'zulu'
+          java-version: '17'
 
       - name: Build release APK
         run: |
diff --git a/.github/workflows/apk_pr.yml b/.github/workflows/apk_pr.yml
index e9c5dc6aa..50f4061c3 100644
--- a/.github/workflows/apk_pr.yml
+++ b/.github/workflows/apk_pr.yml
@@ -18,9 +18,10 @@ jobs:
       - uses: ./.github/actions/checkout_submodules
 
       - name: Setup Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 17
+          distribution: 'zulu'
+          java-version: '17'
 
       - name: Build release APK
         run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fc52f95e0..26c73fc97 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   test:
     name: Run Tests
-    runs-on: windows-latest
+    runs-on: windows-latest # TODO: Ubuntu currently broken.
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -21,7 +21,10 @@ jobs:
           java-version: 17
 
       - name: Run tests
-        run: bash ./gradlew check
+        run: bash ./gradlew test
+
+      - name: Run lint
+        run: bash ./gradlew ktlintCheck
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
diff --git a/app/build.gradle b/app/build.gradle
index e90d324e7..46b1543a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,6 +58,8 @@ android {
 
     sourceSets {
         main {
+            // TODO: Find a way to exclude linux .so
+            // TODO: Reintroduce the jlibtorrent library for linux.
             jniLibs.srcDirs = ['../common/libs']
         }
     }
diff --git a/common/libs/libjlibtorrent-1.2.19.0.so b/common/libs/libjlibtorrent-1.2.19.0.so
deleted file mode 100755
index b6bc05e3e..000000000
Binary files a/common/libs/libjlibtorrent-1.2.19.0.so and /dev/null differ