timestamp further fixes