Bugfix
Track more timings.