Fix bugs occuring when trying to reproduce some results