Fix reproducible build issues