Fixed some ACL issues