Code correction to integrate 2.2.1 devices in topo