Fixed some issues with the timestamps implementation