Backport patches to fix reproducibility issues