diff --git a/lib/GeoExt/data/PrintProvider.js b/lib/GeoExt/data/PrintProvider.js
index 88d6eafe..d2a99663 100644
--- a/lib/GeoExt/data/PrintProvider.js
+++ b/lib/GeoExt/data/PrintProvider.js
@@ -666,6 +666,15 @@ GeoExt.data.PrintProvider = Ext.extend(Ext.util.Observable, {
                     extension: "png"
                 });
             },
+            "XYZ": function (layer) {
+                var enc = this.encoders.layers.TileCache.call(this, layer);
+                return Ext.apply(enc, {
+                    type: 'XYZ',
+                    baseURL: enc.baseURL.substr(0, enc.baseURL.indexOf("$")),
+                    extension: enc.baseURL.substr(enc.baseURL.lastIndexOf("$")).split(".").pop(),
+                    tileOriginCorner: layer.tileOriginCorner
+                });
+            },
             "TMS": function(layer) {
                 var enc = this.encoders.layers.TileCache.call(this, layer);
                 return Ext.apply(enc, {
diff --git a/lib/GeoExt/widgets/form.js b/lib/GeoExt/widgets/form.js
index 71db5f84..0e7b331f 100644
--- a/lib/GeoExt/widgets/form.js
+++ b/lib/GeoExt/widgets/form.js
@@ -156,7 +156,7 @@ GeoExt.form.recordToField = function(record, options) {
         // field, just return it
         return type;
     }
-    type = type.split(":").pop(); // remove ns prefix
+    type = type.split(":").length > 1 ? type.split(":").pop() : type; // optionally remove ns prefix
     
     var field;
     var name = record.get("name");
@@ -243,7 +243,7 @@ GeoExt.form.recordToField.REGEXES = {
         "^(text|string)$", "i"
     ),
     "number": new RegExp(
-        "^(number|float|decimal|double|int|long|integer|short)$", "i"
+        "^(number|float|decimal|double|real|int|long|integer|short)$", "i"
     ),
     "boolean": new RegExp(
         "^(boolean)$", "i"