Fixing ACL issues