diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
index 4760de3a..f3c66506 100644
--- a/.github/workflows/build_check.yml
+++ b/.github/workflows/build_check.yml
@@ -17,3 +17,4 @@ on:
 jobs:
   build:
     uses: ./.github/workflows/build.yml
+    secrets: inherit
diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml
index 43f4d1c9..64d1d6d9 100644
--- a/.github/workflows/deploy_release.yml
+++ b/.github/workflows/deploy_release.yml
@@ -50,6 +50,7 @@ jobs:
   call-release-build:
     uses: ./.github/workflows/build.yml
     needs: calculate-version
+    secrets: inherit
     with:
       next_version_major: ${{ needs.calculate-version.outputs.next_version_major }}
       next_version_minor: ${{ needs.calculate-version.outputs.next_version_minor }}
diff --git a/.github/workflows/deploy_release_android.yml b/.github/workflows/deploy_release_android.yml
deleted file mode 100644
index 7812c334..00000000
--- a/.github/workflows/deploy_release_android.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-name: Deploy experimental android release
-on:
-  workflow_dispatch:
-    inputs:
-      build_type:
-        description: Build type
-        required: false
-        type: string
-      version_major:
-        description: Version major
-        required: false
-        type: string
-      version_minor:
-        description: Version minor
-        required: false
-        type: string
-
-jobs:
-  deploy:
-    name: Deploy experimental release
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-          fetch-depth: 0
-
-      - name: Install system dependencies
-        run: |
-          sudo apt update -qq
-          sudo apt install -y gettext
-
-      - name: Uncompile message catalogs
-        run: |
-          for mo_file in bin/resources/*/cemu.mo
-          do
-            echo $mo_file
-            language_code=$(basename $(dirname $mo_file))
-            po_file=src/android/app/src/main/assets/translations/$language_code/cemu.po
-            mkdir -p $(dirname $po_file)
-            msgunfmt $mo_file -o $po_file || echo "Failed to uncompile message catalog from $mo_file"
-          done
-
-      - name: Build Cemu
-        env:
-          ANDROID_STORE_FILE_BASE64: ${{ secrets.ANDROID_STORE_FILE_BASE64 }}
-          ANDROID_KEY_STORE_PASSWORD: ${{ secrets.ANDROID_KEY_STORE_PASSWORD }}
-          ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
-          EMULATOR_VERSION_MAJOR: ${{ inputs.version_major }}
-          EMULATOR_VERSION_MINOR: ${{ inputs.version_minor }}
-        run: |
-          export JAVA_HOME=$JAVA_HOME_17_X64
-
-          cd ./src/android
-
-          if [[ -n "$ANDROID_STORE_FILE_BASE64" ]]; then
-            base64 --decode <<< "${ANDROID_STORE_FILE_BASE64}" > store.jks
-            export ANDROID_STORE_FILE=$(pwd)/store.jks
-          fi
-
-          ./gradlew assembleRelease
-
-      - name: Set version dependent vars
-        env:
-          EMULATOR_VERSION_MAJOR: ${{ inputs.version_major }}
-          EMULATOR_VERSION_MINOR: ${{ inputs.version_minor }}
-        run: |
-          echo "CEMU_VERSION=$EMULATOR_VERSION_MAJOR.$EMULATOR_VERSION_MINOR" >> $GITHUB_ENV
-
-      - name: Create release
-        run: |
-          VERSION=${{ env.CEMU_VERSION }}
-          mkdir upload
-          mv ./src/android/app/build/outputs/apk/*/*.apk upload/Cemu-$VERSION.apk
-          wget -O ghr.tar.gz https://github.com/tcnksm/ghr/releases/download/v0.15.0/ghr_v0.15.0_linux_amd64.tar.gz
-          tar xvzf ghr.tar.gz; rm ghr.tar.gz
-          echo "[INFO] Release tag: v${{ env.CEMU_VERSION }}"
-          RELEASE_BODY=$(printf "Experimental release %s" "${{ env.CEMU_VERSION }}")
-          ghr_v0.15.0_linux_amd64/ghr -b "$RELEASE_BODY" -t ${{ secrets.GITHUB_TOKEN }} -n "Cemu ${{ env.CEMU_VERSION }}" "${{ env.CEMU_VERSION }}" ./upload
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h
index 4b643b8f..5b33be88 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanAPI.h
@@ -144,7 +144,6 @@ VKFUNC_INSTANCE(vkCreateXcbSurfaceKHR);
 VKFUNC_INSTANCE(vkCreateWaylandSurfaceKHR);
 #endif // HAS_WAYLAND
 #endif // BOOST_OS_LINUX || BOOST_OS_BSD
-#endif // __ANDROID__
 
 #if BOOST_OS_WINDOWS
 VKFUNC_INSTANCE(vkCreateWin32SurfaceKHR);
diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
index 303dba56..b35c8218 100644
--- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
+++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp
@@ -1493,9 +1493,8 @@ VkSurfaceKHR VulkanRenderer::CreateWaylandSurface(VkInstance instance, wl_displa
 
     return result;
 }
-#endif 
-#endif 
-#endif 
+#endif
+#endif
 
 VkSurfaceKHR VulkanRenderer::CreateFramebufferSurface(VkInstance instance, WindowSystem::WindowHandleInfo& windowInfo)
 {
diff --git a/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp b/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp
index 315a0cc5..4f1552f2 100644
--- a/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp
+++ b/src/Common/ExceptionHandler/ExceptionHandler_posix.cpp
@@ -17,7 +17,7 @@
 #include <boost/stacktrace.hpp>
 #endif  // __ANDROID__
 
-#if BOOST_OS_LINUX
+#if BOOST_OS_LINUX && !__ANDROID__
 void DemangleAndPrintBacktrace(char** backtrace, size_t size)
 {
 	ELFSymbolTable symTable;
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index 41c09320..d26706ec 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -30,9 +30,9 @@ fun String.runCommand(workingDir: File = File(".")): String? {
 
 fun getGitHash(): String? = "git log --format=%h -1".runCommand()?.trim()
 
-val versionMajor: String? = System.getenv("EMULATOR_VERSION_MAJOR")
-val versionMinor: String? = System.getenv("EMULATOR_VERSION_MINOR")
-
+val versionMajor: Int? = System.getenv("EMULATOR_VERSION_MAJOR")?.toIntOrNull()
+val versionMinor: Int? = System.getenv("EMULATOR_VERSION_MINOR")?.toIntOrNull()
+versionMajor
 fun getVersionName(): String {
     if (versionMajor != null && versionMinor != null)
         return "$versionMajor.$versionMinor"