Minor ACL grouping improvements