diff --git a/pom.xml b/pom.xml
index f05132e8c6..73ae6bd8aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
    </modules>
 
    <properties>
-      <alfresco.base.version>5.0.a</alfresco.base.version>
+      <alfresco.base.version>5.0-BF-SNAPSHOT</alfresco.base.version>
 
       <!-- Database properties - default values to be overridden in settings.xml -->
       <db.driver>org.postgresql.Driver</db.driver>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml
index 9310260baf..69f8fb517c 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/query/rm-query-context.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<bean id="rmSqlSessionFactory" class="org.alfresco.ibatis.HierarchicalSqlSessionFactoryBean">
-        <property name="useLocalCaches" value="${mybatis.useLocalCaches}"/>
         <property name="resourceLoader" ref="dialectResourceLoader"/>
         <property name="dataSource" ref="dataSource"/>
         <property name="configLocation">
@@ -17,9 +16,9 @@
         <constructor-arg index="0" ref="rmSqlSessionFactory"/>
     </bean>
 
-	<bean id="recordsManagementQueryDAO" class="org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl">	
+	<bean id="recordsManagementQueryDAO" class="org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAOImpl">
 		<property name="sqlSessionTemplate" ref="rmSqlSessionTemplate"/>
-		<property name="qnameDAO" ref="qnameDAO"/>	
+		<property name="qnameDAO" ref="qnameDAO"/>
 	</bean>
 
 </beans>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index c51ee08fda..09beb21fc7 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -216,7 +216,7 @@
       <dependency>
          <groupId>org.springframework.extensions.surf</groupId>
          <artifactId>spring-webscripts</artifactId>
-         <version>1.2.0</version>
+         <version>${alfresco.base.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>