More deterministic builds enhancements