Increase robustness of control plane wait