Fixes to actually make it work with the new-new way to run the experiment