Fixes to TasksGroup plugin