Add some heuristics to deal with shorter initial sync periods.