diff --git a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
index d191026e2a..211564cdb5 100644
--- a/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
+++ b/source/java/org/alfresco/repo/activities/feed/FeedTaskProcessor.java
@@ -25,13 +25,11 @@
 package org.alfresco.repo.activities.feed;
 
 import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.StringWriter;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -527,12 +525,10 @@ public abstract class FeedTaskProcessor
             templateCache.put(fmTemplate, myTemplate);
         }
         
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        Writer out = new OutputStreamWriter(bos);
-        myTemplate.process(model, out);
-        out.flush();
+        StringWriter textWriter = new StringWriter();
+        myTemplate.process(model, textWriter);
         
-        return new String(bos.toByteArray());
+        return textWriter.toString();
     }
     
     protected List<FeedControlDAO> getFeedControls(String connectedUser) throws SQLException
diff --git a/source/java/org/alfresco/repo/jscript/AVM.java b/source/java/org/alfresco/repo/jscript/AVM.java
index 28b5578701..411893b40c 100644
--- a/source/java/org/alfresco/repo/jscript/AVM.java
+++ b/source/java/org/alfresco/repo/jscript/AVM.java
@@ -154,8 +154,10 @@ public final class AVM extends BaseScopableProcessorExtension
 
         SandboxService sbService = this.services.getSandboxService();
         
+        String userStoreId = userSandboxStore(storeId, username);
+        
         // get modified items - not including deleted
-        List<AssetInfo> assets = sbService.listChangedWebApp(storeId, webapp, false);
+        List<AssetInfo> assets = sbService.listChangedWebApp(userStoreId, webapp, false);
         
         List<AVMNode> items = new ArrayList<AVMNode>(assets.size());
         
diff --git a/source/java/org/alfresco/repo/template/AVM.java b/source/java/org/alfresco/repo/template/AVM.java
index 0551d6ecbf..8979bf6d19 100644
--- a/source/java/org/alfresco/repo/template/AVM.java
+++ b/source/java/org/alfresco/repo/template/AVM.java
@@ -143,9 +143,11 @@ public class AVM extends BaseTemplateProcessorExtension
         ParameterCheck.mandatoryString("Webapp", webapp);
 
         SandboxService sbService = this.services.getSandboxService();
+
+        String userStoreId = userSandboxStore(storeId, username);
         
         // get modified items - not including deleted
-        List<AssetInfo> assets = sbService.listChangedWebApp(storeId, webapp, false);
+        List<AssetInfo> assets = sbService.listChangedWebApp(userStoreId, webapp, false);
         
         List<AVMTemplateNode> items = new ArrayList<AVMTemplateNode>(assets.size());