diff --git a/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java b/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java
index a1af5ae2e5..e5d84fcd84 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java
@@ -17,6 +17,8 @@
 
 package org.alfresco.repo.avm;
 
+import java.io.Serializable;
+
 /**
  * This class describes an AVM node object.  
  * It serves a similar purpose to the data structure
@@ -24,8 +26,10 @@ package org.alfresco.repo.avm;
  *
  * @author britt
  */
-public class AVMNodeDescriptor
+public class AVMNodeDescriptor implements Serializable
 {
+    private static final long serialVersionUID = -7959606980486852184L;
+
     /**
      * The path that this was looked up with.
      */
diff --git a/source/java/org/alfresco/repo/avm/AVMRemote.java b/source/java/org/alfresco/repo/avm/AVMRemote.java
index 3675870f62..af8e560c36 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemote.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemote.java
@@ -69,10 +69,9 @@ public interface AVMRemote
      * starting at offset <code>offset</code> in <code>buff</code>
      * @param handle The opaque handle to the server side output stream.
      * @param buff The data buffer.
-     * @param offset The offset within the buffer.
      * @param count The number of bytes to write.
      */
-    public void writeOutput(String handle, byte [] buff, int offset, int count);
+    public void writeOutput(String handle, byte [] buff, int count);
     
     /**
      * Close the server side output stream designated by the handle.
diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java
index 359f6f510e..52d9dcd9c7 100644
--- a/source/java/org/alfresco/repo/avm/AVMRepository.java
+++ b/source/java/org/alfresco/repo/avm/AVMRepository.java
@@ -29,7 +29,6 @@ import java.util.SortedMap;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.namespace.QName;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
index cef93322c9..b78de31a01 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
@@ -22,7 +22,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.RandomAccessFile;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 67e2bb6e6b..256b88b897 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -21,7 +21,6 @@ import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreDescriptor.java b/source/java/org/alfresco/repo/avm/AVMStoreDescriptor.java
index 78be68c5fa..4f279ede42 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreDescriptor.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreDescriptor.java
@@ -17,14 +17,17 @@
 
 package org.alfresco.repo.avm;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * A value class for Data about an AVMStore.
  * @author britt
  */
-public class AVMStoreDescriptor
+public class AVMStoreDescriptor implements Serializable
 {
+    private static final long serialVersionUID = -4401863082685362175L;
+
     /**
      * The name.
      */
diff --git a/source/java/org/alfresco/repo/avm/LayeringDescriptor.java b/source/java/org/alfresco/repo/avm/LayeringDescriptor.java
index 12cc10ac95..4600d59155 100644
--- a/source/java/org/alfresco/repo/avm/LayeringDescriptor.java
+++ b/source/java/org/alfresco/repo/avm/LayeringDescriptor.java
@@ -17,13 +17,17 @@
 
 package org.alfresco.repo.avm;
 
+import java.io.Serializable;
+
 /**
  * A value class containing information about the layering state of a looked up
  * node.
  * @author britt
  */
-public class LayeringDescriptor
+public class LayeringDescriptor implements Serializable
 {
+    private static final long serialVersionUID = -6911813236493434123L;
+
     /**
      * Whether the node is a background node.
      */
diff --git a/source/java/org/alfresco/repo/avm/VersionDescriptor.java b/source/java/org/alfresco/repo/avm/VersionDescriptor.java
index f20a36adfb..dcc813f0cf 100644
--- a/source/java/org/alfresco/repo/avm/VersionDescriptor.java
+++ b/source/java/org/alfresco/repo/avm/VersionDescriptor.java
@@ -17,14 +17,17 @@
 
 package org.alfresco.repo.avm;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * All the information about a particular version.
  * @author britt
  */
-public class VersionDescriptor
+public class VersionDescriptor implements Serializable
 {
+    private static final long serialVersionUID = 9045221398461856268L;
+
     /**
      * The name of the store this version belongs to.
      */