diff --git a/source/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java b/source/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java
index 142e27182a..da50abc200 100644
--- a/source/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java
+++ b/source/java/org/alfresco/repo/web/scripts/comments/CommentsPost.java
@@ -46,6 +46,7 @@ import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.util.FileFilterMode.Client;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONStringer;
@@ -149,7 +150,7 @@ public class CommentsPost extends DeclarativeWebScript {
                     
                     String jsonActivityData = jsonWriter.endObject().toString();
                     
-                    activityService.postActivity("org.alfresco.comments.comment-created", siteId, "comments", jsonActivityData);
+                    activityService.postActivity("org.alfresco.comments.comment-created", siteId, "comments", jsonActivityData, Client.webclient);
                 }
                 catch(Exception e)
                 {
diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
index a2969be40b..90c7989240 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/ContentStreamer.java
@@ -326,7 +326,7 @@ public class ContentStreamer implements ResourceLoaderAware
                                     final boolean attach,
                                     final Date modified, 
                                     String eTag, 
-                                    String attachFileName, 
+                                    final String attachFileName, 
                                     Map<String, Object> model) throws IOException
     {
         setAttachment(null, res, attach, attachFileName);
@@ -364,7 +364,7 @@ public class ContentStreamer implements ResourceLoaderAware
                         String siteId = siteService.getSiteShortName(nodeRef);
                         
                         return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId,
-                                    nodeRef.getId(), siteId, propertyQName.toString(), Client.webclient, finalMimetype, size, encoding);
+                                    nodeRef.getId(), siteId, propertyQName.toString(), Client.webclient, attachFileName, finalMimetype, size, encoding);
                     }
                 });
             }
diff --git a/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java b/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
index 5be92def8f..fe273aa764 100644
--- a/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
+++ b/source/java/org/alfresco/repo/webdav/ActivityPosterImpl.java
@@ -25,6 +25,7 @@ import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.activities.ActivityService;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.FileFilterMode.Client;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -123,7 +124,9 @@ public class ActivityPosterImpl implements ActivityPoster
                     activityType,
                     siteId,
                     appTool,
-                    json.toString());
+                    json.toString(),
+                    Client.webdav,
+                    contentNodeInfo);
     }
     
     /**
diff --git a/source/java/org/alfresco/repo/webdav/GetMethod.java b/source/java/org/alfresco/repo/webdav/GetMethod.java
index 37f860217b..d59097aeea 100644
--- a/source/java/org/alfresco/repo/webdav/GetMethod.java
+++ b/source/java/org/alfresco/repo/webdav/GetMethod.java
@@ -309,17 +309,16 @@ public class GetMethod extends WebDAVMethod
         }
     }
 
-    protected void attemptReadContent(FileInfo realNodeInfo, ContentReader reader)
-                throws IOException
+    protected void attemptReadContent(FileInfo realNodeInfo, ContentReader reader) throws IOException
     {
         if (byteRanges != null && byteRanges.startsWith(RANGE_HEADER_UNIT_SPECIFIER))
         {
-            m_davHelper.publishReadEvent(realNodeInfo, reader.getMimetype(), reader.getSize(), byteRanges.substring(6), reader.getEncoding());
             HttpRangeProcessor rangeProcessor = new HttpRangeProcessor(getContentService());
             String userAgent = m_request.getHeader(WebDAV.HEADER_USER_AGENT);
             
             if (m_returnContent)
             {
+                m_davHelper.publishReadEvent(realNodeInfo, reader.getMimetype(), reader.getSize(), byteRanges.substring(6), reader.getEncoding());
                 rangeProcessor.processRange(
                         m_response,
                         reader,
diff --git a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
index c92991a91c..fede6a9acd 100644
--- a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
+++ b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java
@@ -1100,12 +1100,12 @@ public class WebDAVHelper
                 if (StringUtils.hasText(range))
                 { 
                     return new ContentReadRangeEvent(user, networkId, transactionId, realNodeInfo.getNodeRef().getId(),
-                                null, realNodeInfo.getType().toString(), Client.webdav, mimetype, size, contentEncoding, range); 
+                                null, realNodeInfo.getType().toString(), Client.webdav, realNodeInfo.getName(), mimetype, size, contentEncoding, range); 
                 } 
                 else 
                 {
                     return new ContentEventImpl(ContentEvent.DOWNLOAD, user, networkId, transactionId, realNodeInfo.getNodeRef().getId(),
-                                null, realNodeInfo.getType().toString(), Client.webdav, mimetype, size, contentEncoding);            
+                                null, realNodeInfo.getType().toString(), Client.webdav, realNodeInfo.getName(), mimetype, size, contentEncoding);            
                 }
             }
         });