More time code fixes