Fix timing issues