Time to finality improvements

Time to finality improvements