Timings improvements