Some minor stopwatch fixes.