Fixing Trainer and Trainee analytics