Minor fixes to how we're storing timing data.