ACL changes per code review feedback