diff --git a/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java b/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java
index 014718246f..55ea1739d3 100644
--- a/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java
@@ -24,6 +24,7 @@
  */
 package org.alfresco.web.app.servlet;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -164,7 +165,8 @@ public class UploadContentServlet extends BaseServlet
         PermissionService permissionService = serviceRegistry.getPermissionService();
         MimetypeService mimetypeService = serviceRegistry.getMimetypeService();
         
-        InputStream inputStream = req.getInputStream();
+        InputStream is = req.getInputStream();
+        BufferedInputStream inputStream = new BufferedInputStream(is);
 
         // Sort out the mimetype
         String mimetype = req.getParameter(ARG_MIMETYPE);
diff --git a/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java b/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java
index 64a2ca0c3e..6a1cabba7e 100644
--- a/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java
+++ b/source/java/org/alfresco/web/bean/ajax/FileUploadBean.java
@@ -48,6 +48,7 @@ import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.TempFileProvider;
 import org.alfresco.web.app.servlet.BaseServlet;
@@ -166,8 +167,8 @@ public class FileUploadBean implements Serializable
                if (Repository.extractMetadata(fc, cr, contentProps))
                {
                   author = (String)(contentProps.get(ContentModel.PROP_AUTHOR));
-                  title = (String)(contentProps.get(ContentModel.PROP_TITLE));
-                  description = (String)(contentProps.get(ContentModel.PROP_DESCRIPTION));
+                  title = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_TITLE));
+                  description = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_DESCRIPTION));
                }
                
                // default the title to the file name if not set
diff --git a/source/java/org/alfresco/web/bean/content/AddContentDialog.java b/source/java/org/alfresco/web/bean/content/AddContentDialog.java
index aaf4a10544..ffa5fb37c5 100644
--- a/source/java/org/alfresco/web/bean/content/AddContentDialog.java
+++ b/source/java/org/alfresco/web/bean/content/AddContentDialog.java
@@ -45,6 +45,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentReader;
 import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.FileUploadBean;
@@ -81,8 +82,8 @@ public class AddContentDialog extends BaseContentWizard
       if (Repository.extractMetadata(FacesContext.getCurrentInstance(), cr, contentProps))
       {
          this.author = (String)(contentProps.get(ContentModel.PROP_AUTHOR));
-         this.title = (String)(contentProps.get(ContentModel.PROP_TITLE));
-         this.description = (String)(contentProps.get(ContentModel.PROP_DESCRIPTION));
+         this.title = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_TITLE));
+         this.description = DefaultTypeConverter.INSTANCE.convert(String.class, contentProps.get(ContentModel.PROP_DESCRIPTION));
       }
       
       // default the title to the file name if not set