Fix some scenarios that depend on libtopology.