Fixed some issues with the ACL