Fixed some timing issues.