Adjust some timings, seems to be more reliable