Updates for clean reproducibility