Fix datestamps