Actually fix the start/end dates