Fix bugs in topology update control