Improve reproducible build compatibility