Correct timing issues