diff --git a/source/java/org/alfresco/repo/action/ActionServiceImplTest.java b/source/java/org/alfresco/repo/action/ActionServiceImplTest.java
index 7d816b2e2b..d339852e14 100644
--- a/source/java/org/alfresco/repo/action/ActionServiceImplTest.java
+++ b/source/java/org/alfresco/repo/action/ActionServiceImplTest.java
@@ -37,16 +37,13 @@ import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionCondition;
 import org.alfresco.service.cmr.action.ActionConditionDefinition;
 import org.alfresco.service.cmr.action.ActionDefinition;
-import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.action.CompositeAction;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.BaseAlfrescoSpringTest;
-import org.alfresco.util.BaseSpringTest;
 
 /**
  * Action service test
diff --git a/source/java/org/alfresco/repo/version/common/counter/hibernate/HibernateVersionCounterDaoServiceImpl.java b/source/java/org/alfresco/repo/version/common/counter/hibernate/HibernateVersionCounterDaoServiceImpl.java
index 027219f08b..159dd409c0 100644
--- a/source/java/org/alfresco/repo/version/common/counter/hibernate/HibernateVersionCounterDaoServiceImpl.java
+++ b/source/java/org/alfresco/repo/version/common/counter/hibernate/HibernateVersionCounterDaoServiceImpl.java
@@ -16,8 +16,6 @@
  */
 package org.alfresco.repo.version.common.counter.hibernate;
 
-import java.util.concurrent.locks.Lock;
-
 import org.alfresco.repo.domain.StoreKey;
 import org.alfresco.repo.domain.VersionCount;
 import org.alfresco.repo.domain.hibernate.VersionCountImpl;
@@ -37,9 +35,6 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  */
 public class HibernateVersionCounterDaoServiceImpl extends HibernateDaoSupport implements VersionCounterDaoService
 {
-    private Lock countReadLock;
-    private Lock countWriteLock;
-    
     /**
      * Retrieves or creates a version counter
      * 
@@ -56,7 +51,8 @@ public class HibernateVersionCounterDaoServiceImpl extends HibernateDaoSupport i
         {
             // create a new one
             versionCounter = new VersionCountImpl();
-            getHibernateTemplate().save(versionCounter, storeKey);
+            versionCounter.setKey(storeKey);
+            getHibernateTemplate().save(versionCounter);
         }
         return versionCounter;
     }