diff --git a/gstreamer-sharp/EnumInfo.cs b/gstreamer-sharp/EnumInfo.cs
index 758c8ac8ba..4a6a4e4c5a 100644
--- a/gstreamer-sharp/EnumInfo.cs
+++ b/gstreamer-sharp/EnumInfo.cs
@@ -127,7 +127,6 @@ namespace Gst {
       }
 
       g_type_class_unref (class_ptr);
-
     }
   }
 
@@ -199,6 +198,5 @@ namespace Gst {
 
       g_type_class_unref (class_ptr);
     }
-
   }
 }
diff --git a/gstreamer-sharp/Object.custom b/gstreamer-sharp/Object.custom
index 5e38ce742a..64ed3a3639 100644
--- a/gstreamer-sharp/Object.custom
+++ b/gstreamer-sharp/Object.custom
@@ -3,7 +3,10 @@ public object this[string property] {
     return GetProperty (property).Val;
   }
   set {
-    SetProperty (property, new GLib.Value (value));
+    GLib.Value v = new GLib.Value (this, property);
+    v.Val = value;
+    SetProperty (property, v);
+    v.Dispose ();
   }
 }