Fixing some bugs with the chronograph system