diff --git a/metadata/com.calcitem.sanmill.yml b/metadata/com.calcitem.sanmill.yml
index 9c57576e01..25580b07a1 100644
--- a/metadata/com.calcitem.sanmill.yml
+++ b/metadata/com.calcitem.sanmill.yml
@@ -2547,7 +2547,6 @@ Builds:
     srclibs:
       - flutter@3.16.5
     rm:
-      - src/perfect
       - src/test
       - src/ui/flutter_app/ios
       - src/ui/flutter_app/linux
diff --git a/metadata/com.prostudio.urltopdfconverter.yml b/metadata/com.prostudio.urltopdfconverter.yml
index ef821934c9..96b3ba5515 100644
--- a/metadata/com.prostudio.urltopdfconverter.yml
+++ b/metadata/com.prostudio.urltopdfconverter.yml
@@ -25,6 +25,10 @@ Builds:
     versionCode: 2
     commit: 8a205e5e31a750d83056515829cfb9494c6ae4dc
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/de.jepfa.personaltasklogger.yml b/metadata/de.jepfa.personaltasklogger.yml
index ca7a42c55f..1f1c5b48b3 100644
--- a/metadata/de.jepfa.personaltasklogger.yml
+++ b/metadata/de.jepfa.personaltasklogger.yml
@@ -120,6 +120,7 @@ Builds:
   - versionName: 1.5.1
     versionCode: 10501
     commit: 378311400302733f58b6951c5443e425682293cb
+    submodules: true
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
       - flutter@stable
diff --git a/metadata/org.andstatus.todoagenda.yml b/metadata/org.andstatus.todoagenda.yml
index e599a52f0f..de1e960ddc 100644
--- a/metadata/org.andstatus.todoagenda.yml
+++ b/metadata/org.andstatus.todoagenda.yml
@@ -143,6 +143,10 @@ Builds:
     versionCode: 703
     commit: 5a5d160a26c6aa7b81656b1d2bf46b1b5a217b64
     subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y openjdk-17-jdk-headless
+      - update-java-alternatives -a
     gradle:
       - yes
 
diff --git a/metadata/oss.krtirtho.spotube.yml b/metadata/oss.krtirtho.spotube.yml
index e94f3f069e..16074a3ad8 100644
--- a/metadata/oss.krtirtho.spotube.yml
+++ b/metadata/oss.krtirtho.spotube.yml
@@ -589,10 +589,10 @@ Builds:
       - echo "SUPABASE_URL=https://egnloosvpullyovaxpbf.supabase.co" >> .env
       - echo "SUPABASE_API_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImVnbmxvb3N2cHVsbHlvdmF4cGJmIiwicm9sZSI6ImFub24iLCJpYXQiOjE2ODQyMTI4MDIsImV4cCI6MTk5OTc4ODgwMn0.dJWCP05v-Oqsx7r5GOSpq5g2QRKEUzNhPmYI4X79Pmw"
         >> .env
-      - echo "LASTFM_API_KEY=$(echo TEFTVEZNX0FQSV9LRVk9ZTQxZWZmMDFhMTgxYmFmZTY2YjMwZDk0MjlhYWJhN2EK
-        | base64 --decode)" >> .env
-      - echo "LASTFM_API_SECRET=$(echo TEFTVEZNX0FQSV9TRUNSRVQ9ZGQzM2YyOTdiM2ExZTA4ZmEzOWEwNmIzZjcyMTBmYzAK
-        | base64 --decode)" >> .env
+      - echo TEFTVEZNX0FQSV9LRVk9ZTQxZWZmMDFhMTgxYmFmZTY2YjMwZDk0MjlhYWJhN2EK | base64
+        --decode >> .env
+      - echo TEFTVEZNX0FQSV9TRUNSRVQ9ZGQzM2YyOTdiM2ExZTA4ZmEzOWEwNmIzZjcyMTBmYzAK
+        | base64 --decode >> .env
       - echo "ENABLE_UPDATE_CHECK=0" >> .env
       - export PUB_CACHE=$(pwd)/.pub-cache
       - export PATH=$PUB_CACHE/bin/:$$flutter$$/bin/:$PATH