Slight service/swarm improvements