More tweaks to timings.