- Fix some issues related to time stamps