Some changes to fixRootTime