Topology is about to be complete. Some fixes