Multiple Cgroups fixes and additions