swarm2 updates fixes