Topology changes fixes.