More time fixes