Fix stopwatch bugs