Missed some Date -> Timestamp conversions.