diff --git a/config/alfresco/policy-context.xml b/config/alfresco/policy-context.xml
index c357492d09..4e74b39f6f 100644
--- a/config/alfresco/policy-context.xml
+++ b/config/alfresco/policy-context.xml
@@ -47,7 +47,7 @@
     <bean id="dictionaryModelType" class="org.alfresco.repo.dictionary.DictionaryModelType" init-method="init">
       <property name="dictionaryDAO" ref="dictionaryDAO"/>
       <property name="namespaceDAO" ref="namespaceDAO"/>
-      <property name="nodeService" ref="NodeService"/> 
+      <property name="nodeService" ref="nodeService"/>
       <property name="contentService" ref="contentService"/>
       <property name="policyComponent" ref="policyComponent"/>
       <property name="workflowService" ref="WorkflowService"/>
diff --git a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java
index 2c0396c611..913d1777a8 100644
--- a/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java
+++ b/source/java/org/alfresco/repo/i18n/MessageServiceImpl.java
@@ -936,7 +936,7 @@ public class MessageServiceImpl implements MessageService
         int idx = resourceName.indexOf("_");
         if (idx > 0)
         {
-        	bundleBaseName = resourceName.substring(0, idx - 1);
+        	bundleBaseName = resourceName.substring(0, idx);
         }
         else
         {