Updates for v2 and pam_cgroup.