tweaks to TopologyDao