DF minor fixes after upgrade to acl, spring 3.2 & java 8