Fix ID and make timestamp a Date