Some small changes to the experiment manager