diff --git a/Saturn.emu/build.mk b/Saturn.emu/build.mk
index 57c36f3eb..d60d34539 100644
--- a/Saturn.emu/build.mk
+++ b/Saturn.emu/build.mk
@@ -7,7 +7,7 @@ include $(IMAGINE_PATH)/make/imagineAppBase.mk
 
 ifeq ($(SUBARCH), armv6)
  # compile app code in ARMv7, link to ARMv6 libs so dynarec works
- android_cpuFlags = -marm -march=armv7-a -mfloat-abi=softfp -mfpu=vfp
+ android_cpuFlags = -marm -march=armv7-a -mtune=generic -mfloat-abi=softfp -mfpu=vfp
 endif
 
 ifneq ($(config_compiler),clang)
diff --git a/imagine/make/gradle/app/build.gradle b/imagine/make/gradle/app/build.gradle
index 6ac3feacf..464c3de4c 100644
--- a/imagine/make/gradle/app/build.gradle
+++ b/imagine/make/gradle/app/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 
@@ -68,6 +68,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.aar')
-    implementation "com.android.support:support-v4:23.3.+"
+    implementation "com.android.support:support-v4:25.4.+"
 }
 
diff --git a/imagine/make/linux-x86_64-gcc.mk b/imagine/make/linux-x86_64-gcc.mk
index 0fe6a2ac2..88106cfca 100755
--- a/imagine/make/linux-x86_64-gcc.mk
+++ b/imagine/make/linux-x86_64-gcc.mk
@@ -5,7 +5,7 @@ include $(buildSysPath)/linux-gcc.mk
 
 ARCH := x86_64
 ifeq ($(config_compiler),clang)
- CFLAGS_CODEGEN += -march=x86-64
+ CFLAGS_CODEGEN += -march=x86-64 -mtune=generic
 else
  CFLAGS_CODEGEN += -m64 -mtune=generic
  LDFLAGS_SYSTEM += -m64
diff --git a/imagine/src/base/android/imagine-v9/build.gradle b/imagine/src/base/android/imagine-v9/build.gradle
index e9626edda..f60bdb868 100644
--- a/imagine/src/base/android/imagine-v9/build.gradle
+++ b/imagine/src/base/android/imagine-v9/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }