diff --git a/gxml/Serializable.vala b/gxml/Serializable.vala
index 87d27ec7a41b4bb6a443834a2f18c5f40b35b212..5028eba3cb36871309b57fe9f200a1315eb36b6c 100644
--- a/gxml/Serializable.vala
+++ b/gxml/Serializable.vala
@@ -152,7 +152,7 @@ namespace GXml {
      * 
      * @param doc an {@link GXml.Document} object to serialize to.
      */
-    public abstract GXml.xNode? serialize (GXml.xNode node) throws GLib.Error;
+    public abstract GXml.Node? serialize (GXml.Node node) throws GLib.Error;
 
     /**
      * Serialize a property @prop on a {@link GXml.xElement}.
diff --git a/gxml/SerializableGeeArrayList.vala b/gxml/SerializableGeeArrayList.vala
index a6a51bb272173e6206193431862b55a61bb17766..645fcda0113c43f7a58ea57351e99fd3a983781e 100644
--- a/gxml/SerializableGeeArrayList.vala
+++ b/gxml/SerializableGeeArrayList.vala
@@ -81,13 +81,13 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
     return false;
   }
 
-  public virtual GXml.xNode? serialize (GXml.xNode node)
+  public virtual GXml.Node? serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
     return default_serialize (node);
   }
-  public GXml.xNode? default_serialize (GXml.xNode node)
+  public GXml.Node? default_serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
diff --git a/gxml/SerializableGeeDualKeyMap.vala b/gxml/SerializableGeeDualKeyMap.vala
index ce5dede1b6eee261231390c87d0b6429ad101243..eae37d91c779fd8d681e691b395183c5a17135ee 100644
--- a/gxml/SerializableGeeDualKeyMap.vala
+++ b/gxml/SerializableGeeDualKeyMap.vala
@@ -162,13 +162,13 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
     return false;
   }
 
-  public virtual GXml.xNode? serialize (GXml.xNode node)
+  public virtual GXml.Node? serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
     return default_serialize (node);
   }
-  public GXml.xNode? default_serialize (GXml.xNode node)
+  public GXml.Node? default_serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
diff --git a/gxml/SerializableGeeHashMap.vala b/gxml/SerializableGeeHashMap.vala
index 7b2ebef3600b9b1b3d11874724a613b6ef126bbd..aaba248e01d0f12303a66639a57d046d9c138475 100644
--- a/gxml/SerializableGeeHashMap.vala
+++ b/gxml/SerializableGeeHashMap.vala
@@ -78,13 +78,13 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
     return false;
   }
 
-  public virtual GXml.xNode? serialize (GXml.xNode node)
+  public virtual GXml.Node? serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
     return default_serialize (node);
   }
-  public GXml.xNode? default_serialize (GXml.xNode node)
+  public GXml.Node? default_serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
diff --git a/gxml/SerializableGeeTreeMap.vala b/gxml/SerializableGeeTreeMap.vala
index 6008d021002a2bbf1bc47d5e81e810222f640f9f..d28f2bd8a54d91ef0a1bb52ecbf7b2940298916d 100644
--- a/gxml/SerializableGeeTreeMap.vala
+++ b/gxml/SerializableGeeTreeMap.vala
@@ -81,13 +81,13 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
     return false;
   }
 
-  public virtual GXml.xNode? serialize (GXml.xNode node)
+  public virtual GXml.Node? serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
     return default_serialize (node);
   }
-  public GXml.xNode? default_serialize (GXml.xNode node)
+  public GXml.Node? default_serialize (GXml.Node node)
                               throws GLib.Error
                               requires (node is xElement)
   {
diff --git a/gxml/SerializableJson.vala b/gxml/SerializableJson.vala
index bc4c48f843d4fc25f8d4e7a029bc077c746ee771..cbc4d1ba13bff94e8ea13c7b262e08254b0e6498 100644
--- a/gxml/SerializableJson.vala
+++ b/gxml/SerializableJson.vala
@@ -116,7 +116,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
    * Is up to you to add convenient xElement node to a xDocument, in order to be
    * used by serialize and add new <Object> tags per object to serialize.
    */
-  public GXml.xNode? serialize (GXml.xNode node) throws GLib.Error
+  public GXml.Node? serialize (GXml.Node node) throws GLib.Error
   {
     xDocument doc;
     xElement root;
@@ -126,7 +126,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
     if (node is xDocument)
       doc = (xDocument) node;
     else
-      doc = node.owner_document;
+      doc = (xDocument) node.document;
 
     root = (xElement) doc.create_element ("Object");
     doc.append_child (root);
@@ -153,7 +153,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
     if (type.is_a (typeof (Serializable))) {
       val = Value (type);
       this.get_property_value (prop, ref val);
-      return ((Serializable) val.get_object ()).serialize (element);
+      return (xNode)((Serializable) val.get_object ()).serialize (element);
     }
 
     var doc = element.owner_document;
diff --git a/gxml/SerializableObjectModel.vala b/gxml/SerializableObjectModel.vala
index 6f4a608eb5cdbe93a38b471e7c792e25ac514e20..46691c49354611cabdf955b377c2d8a8e454031b 100644
--- a/gxml/SerializableObjectModel.vala
+++ b/gxml/SerializableObjectModel.vala
@@ -92,12 +92,12 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
     return false;
   }
 
-  public virtual GXml.xNode? serialize (GXml.xNode node)
+  public virtual GXml.Node? serialize (GXml.Node node)
                        throws GLib.Error
                        requires (node_name () != null)
                        requires (node is xDocument || node is xElement)
   {
-    return default_serialize (node);
+    return default_serialize ((xNode)node);
   }
 
   public GXml.xNode? default_serialize (GXml.xNode node) throws GLib.Error
@@ -169,7 +169,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
       get_property (prop.name, ref v);
       var obj = (Serializable) v.get_object ();
       if (obj != null)
-        return obj.serialize (element);
+        return (xNode)obj.serialize (element);
     }
     Value oval;
     if (prop.value_type.is_a (Type.ENUM))
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index 824a78578293234ebe0dd5cdead27eca2cc91e01..0f927e8f52fdf63ef422d1259731e35533553020 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -237,11 +237,11 @@ class Configuration : ObjectModel
     ignored_serializable_properties.set ("invalid",
                                          get_class ().find_property("invalid"));
   }
-  public override GXml.xNode? serialize (GXml.xNode node) throws GLib.Error
+  public override GXml.Node? serialize (GXml.Node node) throws GLib.Error
   {
-    var n = default_serialize (node);
+    var n = (xNode) default_serialize ((xNode)node);
     n.add_namespace_attr ("http://www.gnome.org/gxml/0.4", "om");
-    return n;
+    return (GXml.Node)n;
   }
   public override GXml.xNode? deserialize (GXml.xNode node) throws GLib.Error
   {