More ACL improvements