Fixed timestamp bugs