fixup timings