Make more robust against inaccurate clocks
Minor adjustments