Fixed more timing issues.