Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java	(revision 889876)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java	(working copy)
@@ -251,7 +251,7 @@
                 if (nsFile.exists()) {
                     nsIndex = new HashMapIndex(nsFile);
                 } else {
-                    nsIndex = (NamespaceRegistryImpl) context.getNamespaceRegistry();
+                    nsIndex = (StringIndex) context.getNamespaceRegistry();
                 }
             }
             return nsIndex;
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/AbstractBundlePersistenceManager.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/AbstractBundlePersistenceManager.java	(revision 889876)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/AbstractBundlePersistenceManager.java	(working copy)
@@ -251,7 +251,7 @@
                 if (nsFile.exists()) {
                     nsIndex = new HashMapIndex(nsFile);
                 } else {
-                    nsIndex = (NamespaceRegistryImpl) context.getNamespaceRegistry();
+                    nsIndex = (StringIndex) context.getNamespaceRegistry();
                 }
             }
             return nsIndex;
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ChildNodeEntries.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ChildNodeEntries.java	(revision 889876)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ChildNodeEntries.java	(working copy)
@@ -114,7 +114,7 @@
         if (obj != null) {
             if (obj instanceof ArrayList<?>) {
                 // map entry is a list of siblings
-                siblings = (ArrayList<Object>) obj;
+                siblings = (List<Object>) obj;
                 if (siblings.size() > 0) {
                     // reuse immutable Name instance from 1st same name sibling
                     // in order to help gc conserving memory
@@ -173,7 +173,7 @@
         }
 
         // map entry is a list of siblings
-        List<ChildNodeEntry> siblings = (ArrayList<ChildNodeEntry>) obj;
+        List<ChildNodeEntry> siblings = (List<ChildNodeEntry>) obj;
         if (index > siblings.size()) {
             return null;
         }
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java	(revision 889876)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java	(working copy)
@@ -93,7 +93,7 @@
         // listen to modifications of group-membership
         String[] ntNames = new String[1];
         if (securitySession instanceof SessionImpl) {
-            NameResolver resolver = (SessionImpl) securitySession;
+            NameResolver resolver = (NameResolver) securitySession;
             ntNames[0] = resolver.getJCRName(UserManagerImpl.NT_REP_GROUP);
             pMembers = resolver.getJCRName(UserManagerImpl.P_MEMBERS);
             pPrincipalName = resolver.getJCRName(UserManagerImpl.P_PRINCIPAL_NAME);
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractAccessControlProvider.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractAccessControlProvider.java	(revision 889876)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/authorization/AbstractAccessControlProvider.java	(working copy)
@@ -174,7 +174,7 @@
         }
         session = (SessionImpl) systemSession;
         observationMgr = systemSession.getWorkspace().getObservationManager();
-        resolver = (SessionImpl) systemSession;
+        resolver = (NamePathResolver) systemSession;
 
         privAll = PrivilegeRegistry.getBits(new Privilege[] {session.getAccessControlManager().privilegeFromName(Privilege.JCR_ALL)});
         privRead = PrivilegeRegistry.getBits(new Privilege[] {session.getAccessControlManager().privilegeFromName(Privilege.JCR_READ)});
@@ -196,4 +196,4 @@
     public boolean isLive() {
         return initialized && session.isLive();
     }
-}
\ No newline at end of file
+}