Fix timing bugs

Missing a beat would ruin the rest of the timings due to the timers
still being active.