Fixup timings