fix race condition in distributor, and fix merge-distilled-timings