ACL and Group tweaks