Fixed some more timing issues