Fix support for multiple sims/nodes in a single run