Bug fixing to support new group/course structure.