Several fixes for the experiment