Fix timing issues.