Fixed ACL issues