Fix zones devices to properly edit