diff --git a/ChangeLog b/ChangeLog
index ebb435bd9..8636233e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-22  Mike Kestner  <mkestner@novell.com>
+
+	* generator/ManagedCallString.cs : don't assume ref for structs.
+	* generator/VMSignature.cs : don't assume ref for structs.
+
 2005-06-21  Mike Kestner  <mkestner@novell.com>
 
 	* generator/ConstStringGen.cs : override ToNativeReturn ().
diff --git a/doc/en/Atk/Object.xml b/doc/en/Atk/Object.xml
index 3171e5e8a..6944ea178 100644
--- a/doc/en/Atk/Object.xml
+++ b/doc/en/Atk/Object.xml
@@ -701,21 +701,7 @@ All UI components in an application which provide useful information or services
         <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Atk.Object.StateChange" /> event.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="OnPropertyChange">
-      <MemberSignature Language="C#" Value="protected virtual void OnPropertyChange (ref Atk.PropertyValues values);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="values" Type="Atk.PropertyValues&amp;" RefType="ref" />
-      </Parameters>
-      <Docs>
-        <summary>Default handler for the <see cref="M:Atk.Object.PropertyChange" /> event.</summary>
-        <param name="values">a <see cref="T:Atk.PropertyValues&amp;" /></param>
-        <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Atk.Object.PropertyChange" /> event.</remarks>
-      </Docs>
-    </Member>
+    
     <Member MemberName=".ctor">
       <MemberSignature Language="C#" Value="protected Object (GLib.GType gtype);" />
       <MemberType>Constructor</MemberType>
@@ -799,5 +785,20 @@ All UI components in an application which provide useful information or services
         </Attribute>
       </Attributes>
     </Member>
+  <Member MemberName="OnPropertyChange">
+      <MemberSignature Language="C#" Value="protected virtual void OnPropertyChange (Atk.PropertyValues values);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="values" Type="Atk.PropertyValues" />
+      </Parameters>
+      <Docs>
+        <param name="values">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/Gnome/Canvas.xml b/doc/en/Gnome/Canvas.xml
index e3dcc657c..1aaa40043 100644
--- a/doc/en/Gnome/Canvas.xml
+++ b/doc/en/Gnome/Canvas.xml
@@ -859,21 +859,7 @@
         <remarks>Returns the native <see cref="T:GLib.GType" /> value for <see cref="T:Gnome.Canvas" />.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="OnRenderBackground">
-      <MemberSignature Language="C#" Value="protected virtual void OnRenderBackground (ref Gnome.CanvasBuf buf);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="buf" Type="Gnome.CanvasBuf&amp;" RefType="ref" />
-      </Parameters>
-      <Docs>
-        <summary>Default handler for the <see cref="M:Gnome.Canvas.RenderBackground" /> event.</summary>
-        <param name="buf">a <see cref="T:Gnome.CanvasBuf&amp;" /></param>
-        <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Gnome.Canvas.RenderBackground" /> event.</remarks>
-      </Docs>
-    </Member>
+    
     <Member MemberName="OnDrawBackground">
       <MemberSignature Language="C#" Value="protected virtual void OnDrawBackground (Gdk.Drawable drawable, int x, int y, int width, int height);" />
       <MemberType>Method</MemberType>
@@ -954,5 +940,20 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+  <Member MemberName="OnRenderBackground">
+      <MemberSignature Language="C#" Value="protected virtual void OnRenderBackground (Gnome.CanvasBuf buf);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="buf" Type="Gnome.CanvasBuf" />
+      </Parameters>
+      <Docs>
+        <param name="buf">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/doc/en/Gtk/Clipboard.xml b/doc/en/Gtk/Clipboard.xml
index 22055e618..c20d2b5fb 100644
--- a/doc/en/Gtk/Clipboard.xml
+++ b/doc/en/Gtk/Clipboard.xml
@@ -386,22 +386,7 @@
         </Attribute>
       </Attributes>
     </Member>
-    <Member MemberName="OnOwnerChange">
-      <MemberSignature Language="C#" Value="protected virtual void OnOwnerChange (ref Gdk.EventOwnerChange evnt);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="evnt" Type="Gdk.EventOwnerChange&amp;" RefType="ref" />
-      </Parameters>
-      <Docs>
-        <summary>Default handler for the <see cref="M:Gtk.Clipboard.OwnerChange" /> event.</summary>
-        <param name="evnt">a <see cref="T:Gdk.EventOwnerChange" /></param>
-        <remarks>Override this method in a subclass to provide a default handler for the <see cref="M:Gtk.Clipboard.OwnerChange" /> event.</remarks>
-        <since version="Gtk# 2.6" />
-      </Docs>
-    </Member>
+    
     <Member MemberName="WaitForImage">
       <MemberSignature Language="C#" Value="public Gdk.Pixbuf WaitForImage ();" />
       <MemberType>Method</MemberType>
@@ -494,5 +479,20 @@
         <since version="Gtk# 2.6" />
       </Docs>
     </Member>
+  <Member MemberName="OnOwnerChange">
+      <MemberSignature Language="C#" Value="protected virtual void OnOwnerChange (Gdk.EventOwnerChange evnt);" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="evnt" Type="Gdk.EventOwnerChange" />
+      </Parameters>
+      <Docs>
+        <param name="evnt">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>
diff --git a/generator/ManagedCallString.cs b/generator/ManagedCallString.cs
index 025df45f7..00dffe29f 100644
--- a/generator/ManagedCallString.cs
+++ b/generator/ManagedCallString.cs
@@ -77,7 +77,7 @@ namespace GtkSharp.Generation {
 			for (int i = 0; i < parms.Count; i ++) {
 				Parameter p = parms [i] as Parameter;
 				IGeneratable igen = p.Generatable;
-				result [i] = igen is StructGen ? "ref " : (p.PassAs == "" ? "" : p.PassAs + " ");
+				result [i] = p.PassAs == "" ? "" : p.PassAs + " ";
 				result [i] += ((bool)special[i]) ? "my" + p.Name : igen.FromNative (p.Name);
 			}
 
diff --git a/generator/VMSignature.cs b/generator/VMSignature.cs
index 240bf88a8..f9e7dc177 100644
--- a/generator/VMSignature.cs
+++ b/generator/VMSignature.cs
@@ -62,8 +62,6 @@ namespace GtkSharp.Generation {
 
 			foreach (Parameter p in parms) {
 				result [i] = p.PassAs != "" ? p.PassAs + " " : "";
-				if (p.Generatable is StructGen)
-					result [i] += "ref ";
 				result [i++] += p.CSType + " " + p.Name;
 			}