6 files changed, 30 insertions, 7 deletions
diff --git a/modules/mono/config.py b/modules/mono/config.py
index 7f226443a1..c4f8dcfde8 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -83,7 +83,8 @@ def configure(env):
     mono_lib_names = ['mono-2.0-sgen', 'monosgen-2.0']
 
     if env['platform'] == 'windows':
-        mono_root = None
+        mono_root = ''
+
         if bits == '32':
             if os.getenv('MONO32_PREFIX'):
                 mono_root = os.getenv('MONO32_PREFIX')
diff --git a/modules/mono/glue/cs_files/Array.cs b/modules/mono/glue/cs_files/Array.cs
index 51f57daef4..1ec4d7d20a 100644
--- a/modules/mono/glue/cs_files/Array.cs
+++ b/modules/mono/glue/cs_files/Array.cs
@@ -331,5 +331,10 @@ namespace Godot
         {
             return GetEnumerator();
         }
+
+        internal IntPtr GetPtr()
+        {
+            return objectArray.GetPtr();
+        }
     }
 }
diff --git a/modules/mono/glue/cs_files/Dictionary.cs b/modules/mono/glue/cs_files/Dictionary.cs
index 57a1960ad9..30d17c2a59 100644
--- a/modules/mono/glue/cs_files/Dictionary.cs
+++ b/modules/mono/glue/cs_files/Dictionary.cs
@@ -397,5 +397,10 @@ namespace Godot
         {
             return GetEnumerator();
         }
+
+        internal IntPtr GetPtr()
+        {
+            return objectDict.GetPtr();
+        }
     }
 }
diff --git a/modules/mono/glue/cs_files/GD.cs b/modules/mono/glue/cs_files/GD.cs
index 43de9156f2..0a5d703f27 100644
--- a/modules/mono/glue/cs_files/GD.cs
+++ b/modules/mono/glue/cs_files/GD.cs
@@ -192,10 +192,5 @@ namespace Godot
         {
             return NativeCalls.godot_icall_Godot_var2str(var);
         }
-
-        public static WeakRef WeakRef(Object obj)
-        {
-            return NativeCalls.godot_icall_Godot_weakref(Object.GetPtr(obj));
-        }
     }
 }
diff --git a/modules/mono/glue/cs_files/ObjectExtensions.cs b/modules/mono/glue/cs_files/ObjectExtensions.cs
new file mode 100644
index 0000000000..5c9e6609f4
--- /dev/null
+++ b/modules/mono/glue/cs_files/ObjectExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace Godot
+{
+    public partial class Object
+    {
+        public static bool IsInstanceValid(Object instance)
+        {
+            return instance != null && instance.NativeInstance != IntPtr.Zero;
+        }
+
+        public static WeakRef WeakRef(Object obj)
+        {
+            return NativeCalls.godot_icall_Godot_weakref(Object.GetPtr(obj));
+        }
+    }
+}
diff --git a/modules/mono/glue/cs_files/VERSION.txt b/modules/mono/glue/cs_files/VERSION.txt
index 7f8f011eb7..45a4fb75db 100755
--- a/modules/mono/glue/cs_files/VERSION.txt
+++ b/modules/mono/glue/cs_files/VERSION.txt
@@ -1 +1 @@
-7
+8