Some more corrections to get the timings more precise