Fix timeout issues related to UI sync.

Ah! ok. I get it.