Minor bugfixes introduced after interface changes for Topology* implementations.