diff --git a/pom.xml b/pom.xml
index 070c2c8359..d8cd5bf492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,10 +274,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <version>1.5.11</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.11</version>
         </dependency>
         <dependency>
             <groupId>org.beanshell</groupId>
@@ -390,10 +392,6 @@
                     <groupId>woodstox</groupId>
                     <artifactId>wstx-asl</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java
index b0417b5336..39134a404e 100644
--- a/source/java/org/alfresco/opencmis/CMISConnector.java
+++ b/source/java/org/alfresco/opencmis/CMISConnector.java
@@ -3961,17 +3961,17 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
         PermissionDefinitionDataImpl cmisPermission;
 
         cmisPermission = new PermissionDefinitionDataImpl();
-        cmisPermission.setId(BasicPermissions.READ);
+        cmisPermission.setPermission(BasicPermissions.READ);
         cmisPermission.setDescription("CMIS Read");
         result.add(cmisPermission);
 
         cmisPermission = new PermissionDefinitionDataImpl();
-        cmisPermission.setId(BasicPermissions.WRITE);
+        cmisPermission.setPermission(BasicPermissions.WRITE);
         cmisPermission.setDescription("CMIS Write");
         result.add(cmisPermission);
 
         cmisPermission = new PermissionDefinitionDataImpl();
-        cmisPermission.setId(BasicPermissions.ALL);
+        cmisPermission.setPermission(BasicPermissions.ALL);
         cmisPermission.setDescription("CMIS All");
         result.add(cmisPermission);
 
@@ -3981,7 +3981,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
     private PermissionDefinition createPermissionDefinition(PermissionReference pr)
     {
         PermissionDefinitionDataImpl permission = new PermissionDefinitionDataImpl();
-        permission.setId(pr.getQName().toString() + "." + pr.getName());
+        permission.setPermission(pr.getQName().toString() + "." + pr.getName());
         permission.setDescription(permission.getId());
 
         return permission;
diff --git a/source/java/org/alfresco/opencmis/mapping/ContentStreamFileNameProperty.java b/source/java/org/alfresco/opencmis/mapping/ContentStreamFileNameProperty.java
deleted file mode 100644
index 81ec3b2ac2..0000000000
--- a/source/java/org/alfresco/opencmis/mapping/ContentStreamFileNameProperty.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.opencmis.mapping;
-
-import java.io.Serializable;
-
-import org.alfresco.model.ContentModel;
-import org.alfresco.opencmis.CMISConnector;
-import org.alfresco.opencmis.dictionary.CMISNodeInfo;
-import org.alfresco.service.ServiceRegistry;
-import org.alfresco.service.cmr.repository.ContentData;
-import org.apache.chemistry.opencmis.commons.PropertyIds;
-
-/**
- * Accessor for CMIS content stream filename property
- * 
- * @author alex.mukha
- * @since 4.2.4
- */
-public class ContentStreamFileNameProperty extends DirectProperty
-{
-    public ContentStreamFileNameProperty(ServiceRegistry serviceRegistry, CMISConnector connector)
-    {
-        super(serviceRegistry, connector, PropertyIds.CONTENT_STREAM_FILE_NAME, ContentModel.PROP_NAME);
-    }
-    
-    @Override
-    public Serializable getValueInternal(CMISNodeInfo nodeInfo)
-    {
-        ContentData contentData = getContentData(nodeInfo);
-        if (contentData != null && contentData.getSize() > 0)
-        {
-            return super.getValueInternal(nodeInfo);
-        }
-        else
-        {
-            return null;
-        }
-    }
-}
diff --git a/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java b/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
index 67389a97b0..41b1bcab89 100644
--- a/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
+++ b/source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java
@@ -134,7 +134,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
         registerPropertyAccessor(new ContentStreamLengthProperty(serviceRegistry, cmisConnector));
         registerPropertyAccessor(new ContentStreamMimetypeProperty(serviceRegistry, cmisConnector));
         registerPropertyAccessor(new ContentStreamIdProperty(serviceRegistry, cmisConnector));
-        registerPropertyAccessor(new ContentStreamFileNameProperty(serviceRegistry, cmisConnector));
+        registerPropertyAccessor(new DirectProperty(serviceRegistry, cmisConnector,
+                PropertyIds.CONTENT_STREAM_FILE_NAME, ContentModel.PROP_NAME));
         registerPropertyAccessor(new ParentProperty(serviceRegistry, cmisConnector));
         registerPropertyAccessor(new PathProperty(serviceRegistry, cmisConnector));
         registerPropertyAccessor(new AllowedChildObjectTypeIdsProperty(serviceRegistry, cmisConnector, cmisMapping));