Changes to fix face tracking problem.