More time convert fixes