More attempts at fixing reproducibility issues
