diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 825176c61..b1a6dc13d 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -67,3 +67,5 @@
 -dontwarn org.bouncycastle.openssl.PEMKeyPair
 -dontwarn org.bouncycastle.openssl.PEMParser
 -dontwarn org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
+-dontwarn com.android.billingclient.api.BillingClientStateListener
+-dontwarn com.android.billingclient.api.PurchasesUpdatedListener
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
deleted file mode 100644
index 22d7f0043..000000000
--- a/app/src/main/res/values-land/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">48dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml
deleted file mode 100644
index d73f4a359..000000000
--- a/app/src/main/res/values-w1240dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">200dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index 22d7f0043..000000000
--- a/app/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="fab_margin">48dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 73862c416..000000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1 +0,0 @@
-<resources></resources>
\ No newline at end of file
diff --git a/core/src/main/java/org/openedx/core/config/ExperimentalFeaturesConfig.kt b/core/src/main/java/org/openedx/core/config/ExperimentalFeaturesConfig.kt
index 74624178c..03dd43150 100644
--- a/core/src/main/java/org/openedx/core/config/ExperimentalFeaturesConfig.kt
+++ b/core/src/main/java/org/openedx/core/config/ExperimentalFeaturesConfig.kt
@@ -4,5 +4,5 @@ import com.google.gson.annotations.SerializedName
 
 data class ExperimentalFeaturesConfig(
     @SerializedName("APP_LEVEL_DOWNLOADS")
-    val appLevelDownloadsConfig: AppLevelDownloadsConfig,
+    val appLevelDownloadsConfig: AppLevelDownloadsConfig = AppLevelDownloadsConfig(),
 )
diff --git a/dashboard/proguard-rules.pro b/dashboard/proguard-rules.pro
index cdb308aa0..4d3a6c1df 100644
--- a/dashboard/proguard-rules.pro
+++ b/dashboard/proguard-rules.pro
@@ -5,3 +5,5 @@
 -dontshrink
 -dontoptimize
 -dontobfuscate
+
+-dontwarn java.lang.invoke.StringConcatFactory