Various bits of work to get assigning multiple setups simultaneously up and running again.