Fix timeout issues related to UI sync.