6 files changed, 19 insertions, 9 deletions
diff --git a/modules/denoise/config.py b/modules/denoise/config.py
index 49a1f036ed..6f650354cb 100644
--- a/modules/denoise/config.py
+++ b/modules/denoise/config.py
@@ -1,11 +1,12 @@
 def can_build(env, platform):
     # Thirdparty dependency OpenImage Denoise includes oneDNN library
-    # which only supports 64-bit architectures.
+    # and the version we use only supports x86_64.
     # It's also only relevant for tools build and desktop platforms,
     # as doing lightmap generation and denoising on Android or HTML5
     # would be a bit far-fetched.
     desktop_platforms = ["linuxbsd", "osx", "windows"]
-    return env["tools"] and platform in desktop_platforms and env["bits"] == "64" and env["arch"] != "arm64"
+    supported_arch = env["bits"] == "64" and env["arch"] != "arm64" and not env["arch"].startswith("rv")
+    return env["tools"] and platform in desktop_platforms and supported_arch
 
 
 def configure(env):
diff --git a/modules/mono/config.py b/modules/mono/config.py
index 4c851a2989..df02d9a309 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -2,7 +2,7 @@ supported_platforms = ["windows", "osx", "linuxbsd", "server", "android", "haiku
 
 
 def can_build(env, platform):
-    return True
+    return not env["arch"].startswith("rv")
 
 
 def configure(env):
diff --git a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs
index 1d7bfaf0a4..bc09e1ebf9 100644
--- a/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.IdeMessaging/Client.cs
@@ -121,15 +121,20 @@ namespace GodotTools.IdeMessaging
             this.messageHandler = messageHandler;
             this.logger = logger;
 
-            // TODO: Need to fetch the project data dir name from ProjectSettings instead of defaulting to ".godot"
             string projectMetadataDir = Path.Combine(godotProjectDir, ".godot", "mono", "metadata");
+            // FileSystemWatcher requires an existing directory
+            if (!Directory.Exists(projectMetadataDir)) {
+                // Check if the non hidden version exists
+                string nonHiddenProjectMetadataDir = Path.Combine(godotProjectDir, "godot", "mono", "metadata");
+                if (Directory.Exists(nonHiddenProjectMetadataDir)) {
+                    projectMetadataDir = nonHiddenProjectMetadataDir;
+                } else {
+                    Directory.CreateDirectory(projectMetadataDir);
+                }
+            }
 
             MetaFilePath = Path.Combine(projectMetadataDir, GodotIdeMetadata.DefaultFileName);
 
-            // FileSystemWatcher requires an existing directory
-            if (!Directory.Exists(projectMetadataDir))
-                Directory.CreateDirectory(projectMetadataDir);
-
             fsWatcher = new FileSystemWatcher(projectMetadataDir, GodotIdeMetadata.DefaultFileName);
         }
 
diff --git a/modules/raycast/config.py b/modules/raycast/config.py
index 5de36c5322..2f8bacd4ae 100644
--- a/modules/raycast/config.py
+++ b/modules/raycast/config.py
@@ -1,5 +1,7 @@
 def can_build(env, platform):
     # Depends on Embree library, which only supports x86_64 and aarch64.
+    if env["arch"].startswith("rv"):
+        return False
 
     if platform == "android":
         return env["android_arch"] in ["arm64v8", "x86_64"]
diff --git a/modules/regex/config.py b/modules/regex/config.py
index df9f44cb95..1248a8374d 100644
--- a/modules/regex/config.py
+++ b/modules/regex/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return True
+    return not env["arch"].startswith("rv")
 
 
 def configure(env):
diff --git a/modules/theora/config.py b/modules/theora/config.py
index b063ed51f9..7f354a8fda 100644
--- a/modules/theora/config.py
+++ b/modules/theora/config.py
@@ -1,4 +1,6 @@
 def can_build(env, platform):
+    if env["arch"].startswith("rv"):
+        return False
     return env.module_check_dependencies("theora", ["ogg", "vorbis"])